diff options
| author |   Edward Cree <ecree@solarflare.com> | 2020-05-11 13:28:20 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-05-11 13:31:49 -0700 |
| commit | dfcabb078847479cc2874c11af3f6cb3b79ddd03 (patch) | |
| tree | e1233b25e3ed1bd99b2f30efdd3c1508bc1b26ad /drivers/net/ethernet/sfc/mcdi_port.c | |
| parent | Merge branch 'net-Optimize-the-qed-allocations-inside-kdump-kernel' (diff) | |
| download | wireguard-linux-dfcabb078847479cc2874c11af3f6cb3b79ddd03.tar.xz wireguard-linux-dfcabb078847479cc2874c11af3f6cb3b79ddd03.zip | |
sfc: move vport_id to struct efx_nic
Remove some usage of ef10-specific nic_data structs from common MCDI
functions, in preparation for using them from a non-EF10 driver.
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/mcdi_port.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/mcdi_port.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/sfc/mcdi_port.c b/drivers/net/ethernet/sfc/mcdi_port.c index ab5227b13ae6..b807871d8f69 100644 --- a/drivers/net/ethernet/sfc/mcdi_port.c +++ b/drivers/net/ethernet/sfc/mcdi_port.c @@ -722,11 +722,8 @@ static int efx_mcdi_mac_stats(struct efx_nic *efx, MAC_STATS_IN_PERIOD_MS, period); MCDI_SET_DWORD(inbuf, MAC_STATS_IN_DMA_LEN, dma_len); - if (efx_nic_rev(efx) >= EFX_REV_HUNT_A0) { - struct efx_ef10_nic_data *nic_data = efx->nic_data; - - MCDI_SET_DWORD(inbuf, MAC_STATS_IN_PORT_ID, nic_data->vport_id); - } + if (efx_nic_rev(efx) >= EFX_REV_HUNT_A0) + MCDI_SET_DWORD(inbuf, MAC_STATS_IN_PORT_ID, efx->vport_id); rc = efx_mcdi_rpc_quiet(efx, MC_CMD_MAC_STATS, inbuf, sizeof(inbuf), NULL, 0, NULL); |