aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-11 13:24:20 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-01-11 13:24:20 +0000
commit27828be83a4c3ad3182fd30120a1513763154db2 (patch)
treee7fd3ed0386196928472c4f4dc5db54fe17d0930 /package
parent674439299ff49acf98ef0104337fbc154ebfe653 (diff)
downloadupstream-27828be83a4c3ad3182fd30120a1513763154db2.tar.gz
upstream-27828be83a4c3ad3182fd30120a1513763154db2.tar.bz2
upstream-27828be83a4c3ad3182fd30120a1513763154db2.zip
mac80211: fix enabling HT40-
SVN-Revision: 35096
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/patches/300-pending_work.patch15
-rw-r--r--package/mac80211/patches/405-regd_no_assoc_hints.patch4
-rw-r--r--package/mac80211/patches/551-ath9k_revert_initval_change.patch2
3 files changed, 16 insertions, 5 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index ff21112108..d572d6ffd4 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(&reg_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)
{
diff --git a/package/mac80211/patches/405-regd_no_assoc_hints.patch b/package/mac80211/patches/405-regd_no_assoc_hints.patch
index 170bc31886..182bc16a12 100644
--- a/package/mac80211/patches/405-regd_no_assoc_hints.patch
+++ b/package/mac80211/patches/405-regd_no_assoc_hints.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
-@@ -1717,6 +1717,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1719,6 +1719,8 @@ void regulatory_hint_11d(struct wiphy *w
enum environment_cap env = ENVIRON_ANY;
struct regulatory_request *request, *lr;
@@ -9,7 +9,7 @@
mutex_lock(&reg_mutex);
lr = get_last_request();
-@@ -1913,6 +1915,7 @@ static void restore_regulatory_settings(
+@@ -1915,6 +1917,7 @@ static void restore_regulatory_settings(
void regulatory_hint_disconnect(void)
{
diff --git a/package/mac80211/patches/551-ath9k_revert_initval_change.patch b/package/mac80211/patches/551-ath9k_revert_initval_change.patch
index 49aea350c7..ffb08bfbbd 100644
--- a/package/mac80211/patches/551-ath9k_revert_initval_change.patch
+++ b/package/mac80211/patches/551-ath9k_revert_initval_change.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
-@@ -778,11 +778,11 @@ static const u32 ar9300Common_rx_gain_ta
+@@ -958,11 +958,11 @@ static const u32 ar9300Common_rx_gain_ta
{0x0000a074, 0x00000000},
{0x0000a078, 0x00000000},
{0x0000a07c, 0x00000000},