diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-06-02 12:39:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-03 12:28:26 +0200 |
| commit | 3df95ce948dc8ceef07b49003ab944aa047f2a79 (patch) | |
| tree | 9b6d8b911816cd233ec25dfef9b9d3b76549d1f6 | |
| parent | epic100: Test __BIG_ENDIAN instead of (non-existent) CONFIG_BIG_ENDIAN (diff) | |
| download | linux-3df95ce948dc8ceef07b49003ab944aa047f2a79.tar.xz linux-3df95ce948dc8ceef07b49003ab944aa047f2a79.zip | |
sfc: Store port number in net_device::dev_id
This exposes the port number to userland through sysfs.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/sfc/net_driver.h | 4 | ||||
| -rw-r--r-- | drivers/net/sfc/siena.c | 2 |
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 { * struct efx_nic - an Efx NIC * @name: Device name (net device name or bus id before net device registered) * @pci_dev: The PCI device - * @port_num: Index of this host port within the controller * @type: Controller type attributes * @legacy_irq: IRQ number * @workqueue: Workqueue for port reconfigures and the HW monitor. @@ -729,7 +728,6 @@ union efx_multicast_hash { struct efx_nic { char name[IFNAMSIZ]; struct pci_dev *pci_dev; - unsigned port_num; const struct efx_nic_type *type; int legacy_irq; struct workqueue_struct *workqueue; @@ -832,7 +830,7 @@ static inline const char *efx_dev_name(struct efx_nic *efx) static inline unsigned int efx_port_num(struct efx_nic *efx) { - return efx->port_num; + return efx->net_dev->dev_id; } /** 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) } efx_reado(efx, ®, FR_AZ_CS_DEBUG); - efx->port_num = EFX_OWORD_FIELD(reg, FRF_CZ_CS_PORT_NUM) - 1; + efx->net_dev->dev_id = EFX_OWORD_FIELD(reg, FRF_CZ_CS_PORT_NUM) - 1; efx_mcdi_init(efx); |