diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-02 08:48:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-03 12:08:11 -0500 |
commit | 7e300bc8e6736d41e7b92978f415572ac60fd59b (patch) | |
tree | b48dc8243946bd08e3c7eef5171d910218a43987 /drivers/net/sfc/siena.c | |
parent | 02ebc26865c2755720d2ede90a5ab27c45741823 (diff) |
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) | |||
194 | 194 | ||
195 | static int siena_probe_nvconfig(struct efx_nic *efx) | 195 | static int siena_probe_nvconfig(struct efx_nic *efx) |
196 | { | 196 | { |
197 | int rc; | 197 | return efx_mcdi_get_board_cfg(efx, efx->net_dev->perm_addr, NULL); |
198 | |||
199 | rc = efx_mcdi_get_board_cfg(efx, efx->mac_address, NULL); | ||
200 | if (rc) | ||
201 | return rc; | ||
202 | |||
203 | return 0; | ||
204 | } | 198 | } |
205 | 199 | ||
206 | static int siena_probe_nic(struct efx_nic *efx) | 200 | static int siena_probe_nic(struct efx_nic *efx) |