diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-02 16:48:28 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-03 20:08:11 +0300 |
| commit | 7e300bc8e6736d41e7b92978f415572ac60fd59b (patch) | |
| tree | b48dc8243946bd08e3c7eef5171d910218a43987 /drivers/net/sfc/siena.c | |
| parent | 02ebc26865c2755720d2ede90a5ab27c45741823 (diff) | |
| download | linux-7e300bc8e6736d41e7b92978f415572ac60fd59b.tar.xz | |
sfc: Store MAC address from NVRAM in net_device::perm_addr
For some reason we failed to make this change when perm_addr was
introduced.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/siena.c')
| -rw-r--r-- | drivers/net/sfc/siena.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c index b31598079c3d..bf8456176443 100644 --- a/drivers/net/sfc/siena.c +++ b/drivers/net/sfc/siena.c @@ -194,13 +194,7 @@ static int siena_reset_hw(struct efx_nic *efx, enum reset_type method) static int siena_probe_nvconfig(struct efx_nic *efx) { - int rc; - - rc = efx_mcdi_get_board_cfg(efx, efx->mac_address, NULL); - if (rc) - return rc; - - return 0; + return efx_mcdi_get_board_cfg(efx, efx->net_dev->perm_addr, NULL); } static int siena_probe_nic(struct efx_nic *efx) |