Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next

2 files changed, 4 insertions, 1 deletions

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index b5f69831e318..a7990bb16529 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 f9680c9cf9b3..d997d0f0c54a 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;