aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-02-08 12:19:22 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-02-08 12:19:22 +0000
commit683378e25b283046c3f9d0d9f6eeedf01f24031f (patch)
tree05c91ecdbb4c442bc8687cfa3b90dff6da2d1932 /package/kernel
parent95cd5139869e5017c4c91d3457370cf4d123a1c0 (diff)
downloadupstream-683378e25b283046c3f9d0d9f6eeedf01f24031f.tar.gz
upstream-683378e25b283046c3f9d0d9f6eeedf01f24031f.tar.bz2
upstream-683378e25b283046c3f9d0d9f6eeedf01f24031f.zip
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 <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39530 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/mac80211/patches/004-backports-add-led_trigger_blink-_oneshot.patch40
1 files changed, 40 insertions, 0 deletions
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 <hauke@hauke-m.de>
+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 <hauke@hauke-m.de>
+---
+ 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 */