aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/sfc/net_driver.h4
-rw-r--r--drivers/net/sfc/siena.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 5fffd9abffde..4762c91cb587 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -645,7 +645,6 @@ union efx_multicast_hash {
645 * struct efx_nic - an Efx NIC 645 * struct efx_nic - an Efx NIC
646 * @name: Device name (net device name or bus id before net device registered) 646 * @name: Device name (net device name or bus id before net device registered)
647 * @pci_dev: The PCI device 647 * @pci_dev: The PCI device
648 * @port_num: Index of this host port within the controller
649 * @type: Controller type attributes 648 * @type: Controller type attributes
650 * @legacy_irq: IRQ number 649 * @legacy_irq: IRQ number
651 * @workqueue: Workqueue for port reconfigures and the HW monitor. 650 * @workqueue: Workqueue for port reconfigures and the HW monitor.
@@ -729,7 +728,6 @@ union efx_multicast_hash {
729struct efx_nic { 728struct efx_nic {
730 char name[IFNAMSIZ]; 729 char name[IFNAMSIZ];
731 struct pci_dev *pci_dev; 730 struct pci_dev *pci_dev;
732 unsigned port_num;
733 const struct efx_nic_type *type; 731 const struct efx_nic_type *type;
734 int legacy_irq; 732 int legacy_irq;
735 struct workqueue_struct *workqueue; 733 struct workqueue_struct *workqueue;
@@ -832,7 +830,7 @@ static inline const char *efx_dev_name(struct efx_nic *efx)
832 830
833static inline unsigned int efx_port_num(struct efx_nic *efx) 831static inline unsigned int efx_port_num(struct efx_nic *efx)
834{ 832{
835 return efx->port_num; 833 return efx->net_dev->dev_id;
836} 834}
837 835
838/** 836/**
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c
index 7ecd255a7cc0..f2b1e6180753 100644
--- a/drivers/net/sfc/siena.c
+++ b/drivers/net/sfc/siena.c
@@ -222,7 +222,7 @@ static int siena_probe_nic(struct efx_nic *efx)
222 } 222 }
223 223
224 efx_reado(efx, &reg, FR_AZ_CS_DEBUG); 224 efx_reado(efx, &reg, FR_AZ_CS_DEBUG);
225 efx->port_num = EFX_OWORD_FIELD(reg, FRF_CZ_CS_PORT_NUM) - 1; 225 efx->net_dev->dev_id = EFX_OWORD_FIELD(reg, FRF_CZ_CS_PORT_NUM) - 1;
226 226
227 efx_mcdi_init(efx); 227 efx_mcdi_init(efx);
228 228