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/305-ath5k-channel-change-fix.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/305-ath5k-channel-change-fix.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/305-ath5k-channel-change-fix.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/305-ath5k-channel-change-fix.patch b/package/kernel/mac80211/patches/305-ath5k-channel-change-fix.patch index afed7b42ff..4cfa53f6c0 100644 --- a/package/kernel/mac80211/patches/305-ath5k-channel-change-fix.patch +++ b/package/kernel/mac80211/patches/305-ath5k-channel-change-fix.patch @@ -61,7 +61,7 @@ Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c -@@ -2858,7 +2858,7 @@ ath5k_reset(struct ath5k_hw *ah, struct +@@ -2858,7 +2858,7 @@ ath5k_reset(struct ath5k_hw *ah, struct { struct ath_common *common = ath5k_hw_common(ah); int ret, ani_mode; @@ -70,7 +70,7 @@ Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> ATH5K_DBG(ah, ATH5K_DEBUG_RESET, "resetting\n"); -@@ -2876,11 +2876,29 @@ ath5k_reset(struct ath5k_hw *ah, struct +@@ -2876,11 +2876,29 @@ ath5k_reset(struct ath5k_hw *ah, struct * so we should also free any remaining * tx buffers */ ath5k_drain_tx_buffs(ah); |