From: Ben Hutchings Date: Thu, 8 Jul 2010 13:36:32 +0000 (+0000) Subject: sfc: Remove unused field left from mis-merge X-Git-Tag: v3.12-rc1~9497^2~305 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47562e5d325af9ce5306bce53eb7cdd353fe46be;p=kernel%2Fkernel-generic.git 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 Signed-off-by: David S. Miller --- 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;