Skip to content

Commit

Permalink
staging: brcm80211: allow changing channel by mac80211 when associated
Browse files Browse the repository at this point in the history
When associated on 5G the driver receives a probe request for 2G with
a 2G rate specified. The driver asserts as the operating band is still
5G when the probe request packet is given. Root cause was that ioctl
function did fail upon setting the channel as requested by mac80211
when we are associated.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Feb 23, 2011
1 parent f317154 commit eff1b99
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ struct wlc_bsscfg {
pmkid_t pmkid[MAXPMKID]; /* PMKID cache */
uint npmkid; /* num cached PMKIDs */

wlc_bss_info_t *target_bss; /* BSS parms during tran. to ASSOCIATED state */
wlc_bss_info_t *current_bss; /* BSS parms in ASSOCIATED state */

/* PM states */
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ void wlc_set_home_chanspec(struct wlc_info *wlc, chanspec_t chanspec)
FOREACH_BSS(wlc, idx, cfg) {
if (!cfg->associated)
continue;
cfg->target_bss->chanspec = chanspec;

cfg->current_bss->chanspec = chanspec;
}

Expand Down Expand Up @@ -3209,7 +3209,7 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,

wlc->default_bss->chanspec = chspec;
/* wlc_BSSinit() will sanitize the rateset before using it.. */
if (wlc->pub->up && !wlc->pub->associated &&
if (wlc->pub->up &&
(WLC_BAND_PI_RADIO_CHANSPEC != chspec)) {
wlc_set_home_chanspec(wlc, chspec);
wlc_suspend_mac_and_wait(wlc);
Expand Down

0 comments on commit eff1b99

Please sign in to comment.