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>

SVN-Revision: 45710
This commit is contained in:
Jonas Gorski
2015-05-21 19:32:16 +00:00
parent 4bb7b2186e
commit 072937888e
30 changed files with 98 additions and 69 deletions

View File

@@ -583,7 +583,7 @@
default:
return;
}
@@ -5125,9 +5516,42 @@ static int rt2800_init_registers(struct
@@ -5125,9 +5516,42 @@ static int rt2800_init_registers(struct
} else if (rt2x00_rt(rt2x00dev, RT5390) ||
rt2x00_rt(rt2x00dev, RT5392) ||
rt2x00_rt(rt2x00dev, RT5592)) {
@@ -629,7 +629,7 @@
} else if (rt2x00_rt(rt2x00dev, RT5350)) {
rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
} else {
@@ -6159,6 +6583,225 @@ static void rt2800_init_bbp_5592(struct
@@ -6159,6 +6583,225 @@ static void rt2800_init_bbp_5592(struct
rt2800_bbp_write(rt2x00dev, 103, 0xc0);
}