From 19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Thu, 21 May 2015 19:32:16 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45710 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../mac80211/patches/522-mac80211_configure_antenna_gain.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch') 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; -- cgit v1.2.3