diff options
| author | Franky Lin <frankyl@broadcom.com> | 2011-09-16 12:27:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-16 21:39:40 +0200 |
| commit | 24d7d5e8a8c54ddf0085cc69237e8b083f908ce2 (patch) | |
| tree | 88af1aec903404c62a19d3519ca27863f19a2721 | |
| parent | 82553d9ba35a592e3217d8e657d2e6032375fdea (diff) | |
| download | op-kernel-dev-24d7d5e8a8c54ddf0085cc69237e8b083f908ce2.zip op-kernel-dev-24d7d5e8a8c54ddf0085cc69237e8b083f908ce2.tar.gz | |
staging: brcm80211: remove global variable brcmf_roam from fullmac
Remove unnecessary global variable
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd.h | 3 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 3 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h index 329851c..5316df9 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/drivers/staging/brcm80211/brcmfmac/dhd.h @@ -674,9 +674,6 @@ extern uint brcmf_arp_mode; extern uint brcmf_arp_enable; /* Roaming mode control */ -extern uint brcmf_roam; - -/* Roaming mode control */ extern uint brcmf_radio_up; /* Override to force tx queueing all the time */ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 5ae4a40..c02c8cd 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -794,6 +794,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr) char buf[128], *ptr; u32 dongle_align = BRCMF_SDALIGN; u32 glom = 0; + u32 roaming = 1; uint bcn_timeout = 3; int scan_assoc_time = 40; int scan_unassoc_time = 40; @@ -838,7 +839,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr) /* Enable/Disable build-in roaming to allowed ext supplicant to take of romaing */ - brcmu_mkiovar("roam_off", (char *)&brcmf_roam, 4, + brcmu_mkiovar("roam_off", (char *)&roaming, 4, iovbuf, sizeof(iovbuf)); brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_SET_VAR, iovbuf, sizeof(iovbuf)); diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 8e729d8..f462a5f 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); -/* Contorl fw roaming */ -uint brcmf_roam = 1; - /* Control radio state */ uint brcmf_radio_up = 1; |
