From b9ea0a971aad8721742ab2a3962350125260b6c0 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Thu, 30 Jun 2011 14:05:42 -0700 Subject: [PATCH 344/696] net: wireless: bcmdhd: Set interface name to 'wlan' by default Signed-off-by: Dmitry Shmidt --- 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 196ccf3..3d6047d 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; } -- 1.7.1