diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2011-06-30 14:05:42 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:46 -0800 |
commit | eb7d0614401283b5708490951b585b231df42512 (patch) | |
tree | ebc11eb7236abe6e143d00f194274dd69ab34391 | |
parent | 3460f5421e91988358b77422a06f98d63ffcc509 (diff) |
net: wireless: bcmdhd: Set interface name to 'wlan' by default
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r-- | drivers/net/wireless/bcmdhd/wl_android.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_android.c b/drivers/net/wireless/bcmdhd/wl_android.c index 196ccf3d89ca..3d6047de2973 100644 --- a/drivers/net/wireless/bcmdhd/wl_android.c +++ b/drivers/net/wireless/bcmdhd/wl_android.c @@ -82,6 +82,9 @@ int net_os_set_suspend_disable(struct net_device *dev, int val); int net_os_set_suspend(struct net_device *dev, int val); extern bool ap_fw_loaded; +#ifdef CUSTOMER_HW2 +extern char iface_name[IFNAMSIZ]; +#endif /** * Local (static) functions and variables @@ -333,6 +336,10 @@ int wl_android_init(void) #ifdef ENABLE_INSMOD_NO_FW_LOAD dhd_download_fw_on_driverload = FALSE; #endif /* ENABLE_INSMOD_NO_FW_LOAD */ +#ifdef CUSTOMER_HW2 + if (!iface_name[0]) + bcm_strncpy_s(iface_name, IFNAMSIZ, "wlan", IFNAMSIZ); +#endif /* CUSTOMER_HW2 */ return ret; } |