diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:16 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:16 +0000 |
commit | 19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd (patch) | |
tree | 64cea72dc0e5975d838ee1119c3c6b938b9d7435 /package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | |
parent | 87e7581aed0b3df30c2f77eda387806f7c2b824c (diff) | |
download | upstream-19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd.tar.gz upstream-19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd.tar.bz2 upstream-19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd.zip |
mac80211: make it work with 3.18.12+
3.18.12 backported 61ada528dea028331e99e8ceaed87c683ad25de2 ("sched/wait:
Provide infrastructure to deal with nested blocking") from 3.19, causing
the following error on load:
[ 13.588000] compat: exports duplicate symbol woken_wake_function (owned by kernel)
Fix this by guarding it with a check for 3.18.11 or earlier instead of
3.19.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45710 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch')
-rw-r--r-- | package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch index 52dad0bda1..0c50a0bbba 100644 --- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch +++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch @@ -137,10 +137,11 @@ }; /* policy for the key attributes */ -@@ -2207,6 +2208,20 @@ static int nl80211_set_wiphy(struct sk_b +@@ -2206,6 +2207,20 @@ static int nl80211_set_wiphy(struct sk_b + if (result) return result; } - ++ + if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) { + int idx, dbi = 0; + @@ -154,7 +155,6 @@ + if (result) + return result; + } -+ + if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] && info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) { - u32 tx_ant, rx_ant; |