[PATCH net-next-2.6] sfc: Remove unused field left from mis-merge

[PATCH net-next-2.6] sfc: Remove unused field left from mis-merge

[Ben Hutchings]

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>
---
 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 bab836c..64e7caa 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -622,7 +622,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.
@@ -708,7 +707,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;
-- 
1.6.2.5

-- 
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

Re: [PATCH net-next-2.6] sfc: Remove unused field left from mis-merge

[David Miller]

From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 09 Jul 2010 00:36:32 +0100

> 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>

Applied.