Commit 47562e5d authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Remove unused field left from mis-merge 



Commit eedc765c 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: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7fe876af

drivers/net/sfc/net_driver.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE