diff options
| author |   Ben Hutchings <bhutchings@solarflare.com> | 2013-06-10 18:03:17 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-06-12 03:15:02 -0700 |
| commit | 6602041b8343fcdb6433cc72ca6cb6c2e189da6d (patch) | |
| tree | e926b1a9dcd555ed8703ac82c988f5345b4d437f /drivers/net/ethernet/sfc/siena.c | |
| parent | ipv4: remove is_data also from ip_options documentation. (diff) | |
| download | linux-dev-6602041b8343fcdb6433cc72ca6cb6c2e189da6d.tar.xz linux-dev-6602041b8343fcdb6433cc72ca6cb6c2e189da6d.zip | |
sfc: Store port number in private data, not net_device::dev_id
We should not use net_device::dev_id to indicate the port number, as
this affects the way the local part of IPv6 addresses is normally
generated.
This field was intended for use where multiple devices may share a
single assigned MAC address and need to have different IPv6 addresses.
Siena's two ports each have their own MAC addresses.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/siena.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/siena.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c index 51669244d154..8c91775e3c5f 100644 --- a/drivers/net/ethernet/sfc/siena.c +++ b/drivers/net/ethernet/sfc/siena.c @@ -304,7 +304,7 @@ static int siena_probe_nic(struct efx_nic *efx) } efx_reado(efx, ®, FR_AZ_CS_DEBUG); - efx->net_dev->dev_id = EFX_OWORD_FIELD(reg, FRF_CZ_CS_PORT_NUM) - 1; + efx->port_num = EFX_OWORD_FIELD(reg, FRF_CZ_CS_PORT_NUM) - 1; efx_mcdi_init(efx); |