aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/405-regd_no_assoc_hints.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-04-19 18:32:39 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-04-19 18:32:39 +0000
commita26e06cb15efaa9d13180d696715c749725cb99a (patch)
tree7a85fe56c368913a5f2b494c9082c6f72aa56113 /package/mac80211/patches/405-regd_no_assoc_hints.patch
parent1fc922bec9e7f7574cab07cd185263550b4c942a (diff)
downloadmaster-187ad058-a26e06cb15efaa9d13180d696715c749725cb99a.tar.gz
master-187ad058-a26e06cb15efaa9d13180d696715c749725cb99a.tar.bz2
master-187ad058-a26e06cb15efaa9d13180d696715c749725cb99a.zip
mac80211: update to 2012-04-17, adds some build fixes and juhosg's ar9380 tx power fix
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31347 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/405-regd_no_assoc_hints.patch')
-rw-r--r--package/mac80211/patches/405-regd_no_assoc_hints.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/mac80211/patches/405-regd_no_assoc_hints.patch b/package/mac80211/patches/405-regd_no_assoc_hints.patch
index fc7ccc6b2b..577275d26c 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
-@@ -1698,6 +1698,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1699,6 +1699,8 @@ void regulatory_hint_11d(struct wiphy *w
enum environment_cap env = ENVIRON_ANY;
struct regulatory_request *request;
@@ -9,7 +9,7 @@
mutex_lock(&reg_mutex);
if (unlikely(!last_request))
-@@ -1933,6 +1935,8 @@ static void restore_regulatory_settings(
+@@ -1934,6 +1936,8 @@ static void restore_regulatory_settings(
void regulatory_hint_disconnect(void)
{