diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-06-15 15:20:55 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-15 17:21:00 -0700 |
| commit | 170372e4abeddda05fc078e1ae0f01e26a8a7b43 (patch) | |
| tree | a5136f03c06b0943dfc79872c1d601514c0d2085 /drivers/net/wireless/bcmdhd/dhd_common.c | |
| parent | a70ab7beb436f1448445c1609e71fb9a4d4d68b3 (diff) | |
net: wireless: bcmdhd: Fix getting Mac address from platform data
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd_common.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_common.c b/drivers/net/wireless/bcmdhd/dhd_common.c index 013d62236f7..1bfca858b11 100644 --- a/drivers/net/wireless/bcmdhd/dhd_common.c +++ b/drivers/net/wireless/bcmdhd/dhd_common.c @@ -1572,8 +1572,8 @@ dhd_preinit_ioctls(dhd_pub_t *dhd) DHD_ERROR(("%s: can't set MAC address , error=%d\n", __FUNCTION__, ret)); } else memcpy(dhd->mac.octet, (void *)&ea_addr, ETHER_ADDR_LEN); - } -#else + } else { +#endif /* GET_CUSTOM_MAC_ENABLE */ /* Get the default device MAC address directly from firmware */ strcpy(iovbuf, "cur_etheraddr"); if ((ret = dhd_wl_ioctl_cmd(dhd, WLC_GET_VAR, iovbuf, sizeof(iovbuf), FALSE, 0)) < 0) { @@ -1581,6 +1581,8 @@ dhd_preinit_ioctls(dhd_pub_t *dhd) return BCME_NOTUP; } memcpy(dhd->mac.octet, iovbuf, ETHER_ADDR_LEN); +#ifdef GET_CUSTOM_MAC_ENABLE + } #endif /* GET_CUSTOM_MAC_ENABLE */ #ifdef SET_RANDOM_MAC_SOFTAP |