From bb450766c367d364b4729f39ce08cece253d7385 Mon Sep 17 00:00:00 2001 From: Franky Lin Date: Fri, 16 Sep 2011 12:27:55 -0700 Subject: [PATCH] staging: brcm80211: remove global variable brcmf_radio_up from fullmac Remove unnecessary global variable Reviewed-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Franky Lin Signed-off-by: Greg Kroah-Hartman --- 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 insertion(+), 9 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h index 5316df9a24b4..2967ada0cb60 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 c02c8cd46721..2e8db6256502 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 f462a5f1a43e..16f7216098f1 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); -- 2.30.2