diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:04:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:04:03 -0500 |
| commit | c66cfd5325bb215a251f4685fac8718b1da33197 (patch) | |
| tree | 7c8ed5289c4a99ffcd2588ac48b5a512312a375b /net/wireless | |
| parent | ecbbec2eb093d2ef205de371af986f0360fca539 (diff) | |
| parent | 8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398 (diff) | |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/chan.c | 3 | ||||
| -rw-r--r-- | net/wireless/wext-compat.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index b5f69831e31..a7990bb1652 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -265,6 +265,9 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, /* TODO: missing regulatory check on 80/160 bandwidth */ + if (width > 20) + prohibited_flags |= IEEE80211_CHAN_NO_OFDM; + if (!cfg80211_secondary_chans_ok(wiphy, chandef->center_freq1, width, prohibited_flags)) return false; diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index f9680c9cf9b..d997d0f0c54 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -176,7 +176,7 @@ int cfg80211_wext_giwrange(struct net_device *dev, case CFG80211_SIGNAL_TYPE_NONE: break; case CFG80211_SIGNAL_TYPE_MBM: - range->max_qual.level = -110; + range->max_qual.level = (u8)-110; range->max_qual.qual = 70; range->avg_qual.qual = 35; range->max_qual.updated |= IW_QUAL_DBM; |