[PATCH 06/19] staging: brcm80211: remove global variable brcmf_radio_up from fullmac
Franky Lin
frankyl at broadcom.com
Fri Sep 16 19:27:55 UTC 2011
Remove unnecessary global variable
Reviewed-by: Roland Vossen <rvossen at broadcom.com>
Reviewed-by: Arend van Spriel <arend at broadcom.com>
Signed-off-by: Franky Lin <frankyl at broadcom.com>
---
drivers/staging/brcm80211/brcmfmac/dhd.h | 3 ---
drivers/staging/brcm80211/brcmfmac/dhd_common.c | 4 +---
drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 3 ---
3 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h
index 5316df9..2967ada 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -673,9 +673,6 @@ extern uint brcmf_arp_mode;
/* ARP offload enable */
extern uint brcmf_arp_enable;
-/* Roaming mode control */
-extern uint brcmf_radio_up;
-
/* Override to force tx queueing all the time */
extern uint brcmf_force_tx_queueing;
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index c02c8cd..2e8db62 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -845,9 +845,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr)
sizeof(iovbuf));
/* Force STA UP */
- if (brcmf_radio_up)
- brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_UP, (char *)&up,
- sizeof(up));
+ brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_UP, (char *)&up, sizeof(up));
/* Setup event_msgs */
brcmu_mkiovar("event_msgs", drvr->eventmask, BRCMF_EVENTING_MASK_LEN,
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index f462a5f..16f7216 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -98,9 +98,6 @@ module_param(brcmf_arp_mode, uint, 0);
uint brcmf_arp_enable = true;
module_param(brcmf_arp_enable, uint, 0);
-/* Control radio state */
-uint brcmf_radio_up = 1;
-
/* Network inteface name */
char iface_name[IFNAMSIZ] = "wlan";
module_param_string(iface_name, iface_name, IFNAMSIZ, 0);
--
1.7.1
More information about the devel
mailing list