From: hauke Date: Sat, 8 Feb 2014 12:19:22 +0000 (+0000) Subject: mac80211: add led_trigger_blink{_oneshot}() X-Git-Tag: fast2504n-3.10.28-merged~114 X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=0bb512e3d744ddcfd4e8d08bb5ec4a88a0074ede;p=openwrt.git mac80211: add led_trigger_blink{_oneshot}() When led support is deactivated in the kernel and CPTCFG_BACKPORT_BUILD_LEDS is set mac80211 references led_trigger_blink_oneshot() but it is not declared anywhere. This fixes the following build error: net/mac80211/led.c: In function 'ieee80211_led_rx': net/mac80211/led.c:25:2: error: implicit declaration of function 'led_trigger_blink_oneshot' [-Werror=implicit-function-declaration] Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39530 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/package/kernel/mac80211/patches/004-backports-add-led_trigger_blink-_oneshot.patch b/package/kernel/mac80211/patches/004-backports-add-led_trigger_blink-_oneshot.patch new file mode 100644 index 0000000000..584fb05ff5 --- /dev/null +++ b/package/kernel/mac80211/patches/004-backports-add-led_trigger_blink-_oneshot.patch @@ -0,0 +1,40 @@ +From 88e75363ff9c00cc2e7768ca23ded79bf8d6bf08 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Fri, 7 Feb 2014 19:13:11 +0100 +Subject: [PATCH 1/8] backports: add led_trigger_blink{_oneshot}() + +When led support is deactivated in the kernel and +CPTCFG_BACKPORT_BUILD_LEDS is set mac80211 references +led_trigger_blink_oneshot() but it is not declared anywhere. + +This fixes the following build error: +net/mac80211/led.c: In function 'ieee80211_led_rx': +net/mac80211/led.c:25:2: error: implicit declaration of function 'led_trigger_blink_oneshot' [-Werror=implicit-function-declaration] + +Signed-off-by: Hauke Mehrtens +--- + backport-include/backport/leds-disabled.h | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +--- a/backport-include/backport/leds-disabled.h ++++ b/backport-include/backport/leds-disabled.h +@@ -163,6 +163,19 @@ static inline void led_trigger_event(str + enum led_brightness event) + { + } ++ ++static inline void led_trigger_blink(struct led_trigger *trigger, ++ unsigned long *delay_on, ++ unsigned long *delay_off) ++{ ++} ++ ++static inline void led_trigger_blink_oneshot(struct led_trigger *trigger, ++ unsigned long *delay_on, ++ unsigned long *delay_off, ++ int invert) ++{ ++} + #endif + + #endif /* __BACKPORT_LED_DISABLED_SUPPORT */