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 | 072937888e133f5e97fd05a7496eaf7eeae04079 (patch) | |
| tree | 0feb87d5e07d42b118e3231b8261a2610b364c83 /package/kernel/mac80211/patches/315-mac80211-avoid-duplicate-TX-path-station-lookup.patch | |
| parent | 4bb7b2186ef9c56655c0bd035ae2740888c751a9 (diff) | |
| download | upstream-072937888e133f5e97fd05a7496eaf7eeae04079.tar.gz upstream-072937888e133f5e97fd05a7496eaf7eeae04079.tar.bz2 upstream-072937888e133f5e97fd05a7496eaf7eeae04079.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>
SVN-Revision: 45710
Diffstat (limited to 'package/kernel/mac80211/patches/315-mac80211-avoid-duplicate-TX-path-station-lookup.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/315-mac80211-avoid-duplicate-TX-path-station-lookup.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/315-mac80211-avoid-duplicate-TX-path-station-lookup.patch b/package/kernel/mac80211/patches/315-mac80211-avoid-duplicate-TX-path-station-lookup.patch index b02cdafd55..d143025f0f 100644 --- a/package/kernel/mac80211/patches/315-mac80211-avoid-duplicate-TX-path-station-lookup.patch +++ b/package/kernel/mac80211/patches/315-mac80211-avoid-duplicate-TX-path-station-lookup.patch @@ -257,7 +257,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> break; dev_kfree_skb_any(skb); } -@@ -3295,6 +3314,6 @@ void __ieee80211_tx_skb_tid_band(struct +@@ -3295,6 +3314,6 @@ void __ieee80211_tx_skb_tid_band(struct */ local_bh_disable(); IEEE80211_SKB_CB(skb)->band = band; |