Commit 3df95ce9 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Store port number in net_device::dev_id 



This exposes the port number to userland through sysfs.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e2d11b9

drivers/net/sfc/net_driver.h

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

}



/**

drivers/net/sfc/siena.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int siena_probe_nic(struct efx_nic *efx) 
	}



	efx_reado(efx, &reg, 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);