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/530-ath9k_extra_leds.patch | |
| parent | 4bb7b2186ef9c56655c0bd035ae2740888c751a9 (diff) | |
| download | mtk-20170518-072937888e133f5e97fd05a7496eaf7eeae04079.zip mtk-20170518-072937888e133f5e97fd05a7496eaf7eeae04079.tar.gz mtk-20170518-072937888e133f5e97fd05a7496eaf7eeae04079.tar.bz2 | |
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/530-ath9k_extra_leds.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/530-ath9k_extra_leds.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch index 60b6382..b0fb9fe 100644 --- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch +++ b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch @@ -10,7 +10,7 @@ #else static inline void ath_init_leds(struct ath_softc *sc) { -@@ -953,6 +956,13 @@ void ath_ant_comb_scan(struct ath_softc +@@ -953,6 +956,13 @@ void ath_ant_comb_scan(struct ath_softc #define ATH9K_NUM_CHANCTX 2 /* supports 2 operating channels */ @@ -63,7 +63,8 @@ + led->cdev.name = gpio->name; + led->cdev.default_trigger = gpio->default_trigger; + led->cdev.brightness_set = ath_led_brightness; -+ + +- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, val); + ret = led_classdev_register(wiphy_dev(sc->hw->wiphy), &led->cdev); + if (ret < 0) + return ret; @@ -80,8 +81,7 @@ + + return 0; +} - -- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, val); ++ +int ath_create_gpio_led(struct ath_softc *sc, int gpio_num, const char *name, + const char *trigger, bool active_low) +{ @@ -165,7 +165,7 @@ void ath_fill_led_pin(struct ath_softc *sc) --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -935,7 +935,7 @@ int ath9k_init_device(u16 devid, struct +@@ -935,7 +935,7 @@ int ath9k_init_device(u16 devid, struct #ifdef CPTCFG_MAC80211_LEDS /* must be initialized before ieee80211_register_hw */ |