diff options
author | Mursalin Akon <makon@nvidia.com> | 2012-01-27 14:57:30 -0800 |
---|---|---|
committer | Simone Willett <swillett@nvidia.com> | 2012-02-27 20:45:52 -0800 |
commit | fff665d54ef11ae6b572e27f7155cf4cf0c47850 (patch) | |
tree | 45a3de3cb984c4c56b077f11fde053696fed5475 /drivers/net | |
parent | 0b2a58c1a31f2962dd0efd2599111b0a0be594c2 (diff) |
net: wireless: bcmdhd: let BCMDHD_WEXT control wireless extension features
In the driver code wireless extension features are
controlled through WIRELESS_EXT config option.
However, WIRELESS_EXT is turned on by the BCMDHD_WEXT
option of this driver.
Hence, the instead of using WIRELESS_EXT, BCMDHD_WEXT
is used to control wireless extension features.
Bug 924521
(cherry picked from commit 22a9df35537080fbd8a2045c574c5b3e5d08f1ab)
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Change-Id: I68a49271fd3f3616b3beb07f5350d616f3bd9459
Reviewed-on: http://git-master/r/82878
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Allen Martin <amartin@nvidia.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/bcmdhd/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_linux.c | 40 |
2 files changed, 21 insertions, 21 deletions
diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile index 4f49c5ec8b05..6f5a554ae230 100644 --- a/drivers/net/wireless/bcmdhd/Makefile +++ b/drivers/net/wireless/bcmdhd/Makefile @@ -37,7 +37,7 @@ DHDOFILES = aiutils.o bcmsdh_sdmmc_linux.o dhd_linux.o siutils.o bcmutils.o \ obj-$(CONFIG_BCMDHD) += bcmdhd.o bcmdhd-objs += $(DHDOFILES) -ifneq ($(CONFIG_WIRELESS_EXT),) +ifneq ($(CONFIG_BCMDHD_WEXT),) bcmdhd-objs += wl_iw.o DHDCFLAGS += -DSOFTAP endif diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c index 891cf3b084de..76073b9400d9 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux.c @@ -149,10 +149,10 @@ print_tainted() #endif /* LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 15) */ /* Linux wireless extension support */ -#if defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_BCMDHD_WEXT) #include <wl_iw.h> extern wl_iw_extra_params_t g_wl_iw_params; -#endif /* defined(CONFIG_WIRELESS_EXT) */ +#endif /* defined(CONFIG_BCMDHD_WEXT) */ #if defined(CONFIG_HAS_EARLYSUSPEND) #include <linux/earlysuspend.h> @@ -212,9 +212,9 @@ static uint32 maxdelay = 0, tspktcnt = 0, maxdelaypktno = 0; /* Local private structure (extension of pub) */ typedef struct dhd_info { -#if defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_BCMDHD_WEXT) wl_iw_t iw; /* wireless extensions state (must be first) */ -#endif /* defined(CONFIG_WIRELESS_EXT) */ +#endif /* defined(CONFIG_BCMDHD_WEXT) */ dhd_pub_t pub; @@ -455,9 +455,9 @@ int dhd_monitor_init(void *dhd_pub); int dhd_monitor_uninit(void); -#if defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_BCMDHD_WEXT) struct iw_statistics *dhd_get_wireless_stats(struct net_device *dev); -#endif /* defined(CONFIG_WIRELESS_EXT) */ +#endif /* defined(CONFIG_BCMDHD_WEXT) */ static void dhd_dpc(ulong data); /* forward decl */ @@ -2043,7 +2043,7 @@ dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd) return -1; } -#if defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_BCMDHD_WEXT) /* linux wireless extensions */ if ((cmd >= SIOCIWFIRST) && (cmd <= SIOCIWLAST)) { /* may recurse, do NOT lock */ @@ -2051,7 +2051,7 @@ dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd) DHD_OS_WAKE_UNLOCK(&dhd->pub); return ret; } -#endif /* defined(CONFIG_WIRELESS_EXT) */ +#endif /* defined(CONFIG_BCMDHD_WEXT) */ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 2) if (cmd == SIOCETHTOOL) { @@ -2604,7 +2604,7 @@ dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen, void *dev) dhd_monitor_init(&dhd->pub); dhd_state |= DHD_ATTACH_STATE_CFG80211; #endif -#if defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_BCMDHD_WEXT) /* Attach and link in the iw */ if (!(dhd_state & DHD_ATTACH_STATE_CFG80211)) { if (wl_iw_attach(net, (void *)&dhd->pub) != 0) { @@ -2613,7 +2613,7 @@ dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen, void *dev) } dhd_state |= DHD_ATTACH_STATE_WL_ATTACH; } -#endif /* defined(CONFIG_WIRELESS_EXT) */ +#endif /* defined(CONFIG_BCMDHD_WEXT) */ /* Set up the watchdog timer */ @@ -3368,14 +3368,14 @@ dhd_net_attach(dhd_pub_t *dhdp, int ifidx) net->ethtool_ops = &dhd_ethtool_ops; #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) */ -#if defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_BCMDHD_WEXT) #if WIRELESS_EXT < 19 net->get_wireless_stats = dhd_get_wireless_stats; #endif /* WIRELESS_EXT < 19 */ #if WIRELESS_EXT > 12 net->wireless_handlers = (struct iw_handler_def *)&wl_iw_handler_def; #endif /* WIRELESS_EXT > 12 */ -#endif /* defined(CONFIG_WIRELESS_EXT) */ +#endif /* defined(CONFIG_BCMDHD_WEXT) */ dhd->pub.rxsz = DBUS_RX_BUFFER_SIZE_DHD(net); @@ -3391,7 +3391,7 @@ dhd_net_attach(dhd_pub_t *dhdp, int ifidx) net->dev_addr[0], net->dev_addr[1], net->dev_addr[2], net->dev_addr[3], net->dev_addr[4], net->dev_addr[5]); -#if defined(SOFTAP) && defined(CONFIG_WIRELESS_EXT) && !defined(WL_CFG80211) +#if defined(SOFTAP) && defined(CONFIG_BCMDHD_WEXT) && !defined(WL_CFG80211) wl_iw_iscan_set_scan_broadcast_prep(net, 1); #endif @@ -3476,12 +3476,12 @@ void dhd_detach(dhd_pub_t *dhdp) } #endif /* defined(CONFIG_HAS_EARLYSUSPEND) */ -#if defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_BCMDHD_WEXT) if (dhd->dhd_state & DHD_ATTACH_STATE_WL_ATTACH) { /* Detatch and unlink in the iw */ wl_iw_detach(); } -#endif /* defined(CONFIG_WIRELESS_EXT) */ +#endif /* defined(CONFIG_BCMDHD_WEXT) */ if (&dhd->thr_sysioc_ctl.thr_pid >= 0) { PROC_STOP(&dhd->thr_sysioc_ctl); @@ -3929,7 +3929,7 @@ void dhd_os_prefree(void *osh, void *addr, uint size) } #endif /* defined(CONFIG_WIFI_CONTROL_FUNC) */ -#if defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_BCMDHD_WEXT) struct iw_statistics * dhd_get_wireless_stats(struct net_device *dev) { @@ -3947,7 +3947,7 @@ dhd_get_wireless_stats(struct net_device *dev) else return NULL; } -#endif /* defined(CONFIG_WIRELESS_EXT) */ +#endif /* defined(CONFIG_BCMDHD_WEXT) */ static int dhd_wl_host_event(dhd_info_t *dhd, int *ifidx, void *pktdata, @@ -3960,7 +3960,7 @@ dhd_wl_host_event(dhd_info_t *dhd, int *ifidx, void *pktdata, if (bcmerror != BCME_OK) return (bcmerror); -#if defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_BCMDHD_WEXT) if (event->bsscfgidx == 0) { /* * Wireless ext is on primary interface only @@ -3973,7 +3973,7 @@ dhd_wl_host_event(dhd_info_t *dhd, int *ifidx, void *pktdata, wl_iw_event(dhd->iflist[*ifidx]->net, event, *data); } } -#endif /* defined(CONFIG_WIRELESS_EXT) */ +#endif /* defined(CONFIG_BCMDHD_WEXT) */ #ifdef WL_CFG80211 @@ -4280,7 +4280,7 @@ int net_os_send_hang_message(struct net_device *dev) if (dhd) { if (!dhd->pub.hang_was_sent) { dhd->pub.hang_was_sent = 1; -#if defined(CONFIG_WIRELESS_EXT) +#if defined(CONFIG_BCMDHD_WEXT) ret = wl_iw_send_priv_event(dev, "HANG"); #endif #if defined(WL_CFG80211) |