diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-11 13:24:20 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-11 13:24:20 +0000 |
| commit | 6b79db0b599358b109b976f102e22bb0749e9454 (patch) | |
| tree | b708ad08194428c413d789842df0ec4a136a938a /package/mac80211/patches/300-pending_work.patch | |
| parent | 04d51e9b5ee038bd5c897964916cdaaf717a67df (diff) | |
mac80211: fix enabling HT40-
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35096 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index ff2111210..d572d6ffd 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -952,7 +952,18 @@ } /* Used to queue up regulatory hints */ -@@ -1850,7 +1850,7 @@ static void restore_regulatory_settings( +@@ -1125,7 +1125,9 @@ static bool is_ht40_allowed(struct ieee8 + if (chan->flags & IEEE80211_CHAN_DISABLED) + return false; + /* This would happen when regulatory rules disallow HT40 completely */ +- return !(chan->flags & IEEE80211_CHAN_NO_HT40); ++ if ((chan->flags & IEEE80211_CHAN_NO_HT40) == IEEE80211_CHAN_NO_HT40) ++ return false; ++ return true; + } + + static void reg_process_ht_flags_channel(struct wiphy *wiphy, +@@ -1850,7 +1852,7 @@ static void restore_regulatory_settings( mutex_lock(&cfg80211_mutex); mutex_lock(®_mutex); @@ -961,7 +972,7 @@ restore_alpha2(alpha2, reset_user); /* -@@ -2251,14 +2251,21 @@ int set_regdom(const struct ieee80211_re +@@ -2251,14 +2253,21 @@ int set_regdom(const struct ieee80211_re int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env) { |