diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-07-08 09:36:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-09 02:12:29 -0400 |
commit | 47562e5d325af9ce5306bce53eb7cdd353fe46be (patch) | |
tree | 5c7af1406b40b58d8a1301887fa7cd20e3646b13 /drivers/net/sfc | |
parent | 7fe876af921d1d2bc8353e0062c10ff35e902653 (diff) |
sfc: Remove unused field left from mis-merge
Commit eedc765ca4b19a41cf0b921a492ac08d640060d1 merged changes from
net-2.6 that added and then removed efx_nic::port_num, which was also
added in net-next-2.6. The end result should be that it is removed,
since it is now unused.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc')
-rw-r--r-- | drivers/net/sfc/net_driver.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index bab836c22719..64e7caa4bbb5 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
@@ -622,7 +622,6 @@ union efx_multicast_hash { | |||
622 | * struct efx_nic - an Efx NIC | 622 | * struct efx_nic - an Efx NIC |
623 | * @name: Device name (net device name or bus id before net device registered) | 623 | * @name: Device name (net device name or bus id before net device registered) |
624 | * @pci_dev: The PCI device | 624 | * @pci_dev: The PCI device |
625 | * @port_num: Index of this host port within the controller | ||
626 | * @type: Controller type attributes | 625 | * @type: Controller type attributes |
627 | * @legacy_irq: IRQ number | 626 | * @legacy_irq: IRQ number |
628 | * @workqueue: Workqueue for port reconfigures and the HW monitor. | 627 | * @workqueue: Workqueue for port reconfigures and the HW monitor. |
@@ -708,7 +707,6 @@ union efx_multicast_hash { | |||
708 | struct efx_nic { | 707 | struct efx_nic { |
709 | char name[IFNAMSIZ]; | 708 | char name[IFNAMSIZ]; |
710 | struct pci_dev *pci_dev; | 709 | struct pci_dev *pci_dev; |
711 | unsigned port_num; | ||
712 | const struct efx_nic_type *type; | 710 | const struct efx_nic_type *type; |
713 | int legacy_irq; | 711 | int legacy_irq; |
714 | struct workqueue_struct *workqueue; | 712 | struct workqueue_struct *workqueue; |