diff options
| author |   Seth Forshee <seth.forshee@canonical.com> | 2012-08-01 15:58:43 -0500 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-08-02 13:51:48 -0400 |
| commit | 7f38e5bc93203bc76b215dcd2df2067b5b0e004c (patch) | |
| tree | b7cb3ea2cbb1c4c176ffed67c8a3b58d5e85ce8d /drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | |
| parent | libertas: fix two memory leaks (diff) | |
| download | linux-dev-7f38e5bc93203bc76b215dcd2df2067b5b0e004c.tar.xz linux-dev-7f38e5bc93203bc76b215dcd2df2067b5b0e004c.zip | |
brcmsmac: use channel flags to restrict OFDM
brcmsmac cannot call freq_reg_info() during channel changes as it does
not hold cfg80211_lock, and as a result it generates a lockdep warning.
freq_reg_info() is being used to determine whether OFDM is allowed on
the current channel, so we can avoid the errant call by using the new
IEEE80211_CHAN_NO_OFDM for this purpose instead.
Reported-by: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index 9e79d47e077f..192ad5c1fcc8 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -121,7 +121,8 @@ static struct ieee80211_channel brcms_2ghz_chantable[] = { IEEE80211_CHAN_NO_HT40PLUS), CHAN2GHZ(14, 2484, IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS | - IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS) + IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS | + IEEE80211_CHAN_NO_OFDM) }; static struct ieee80211_channel brcms_5ghz_nphy_chantable[] = { |