KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: add blink api backport

Browse source 
This patch was copied from a more recent backports versions. This fixes
a build problem with kernel < 3.6.

This closes #14475

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 38833
This commit is contained in:
Hauke Mehrtens 2013-11-17 15:50:54 +00:00
parent 269cbfa06a
commit 51502a5e29
1 changed files with 65 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
package/kernel/mac80211/patches/070-mac80211-led-blink-api.patch Normal file
View file

@ -0,0 +1,65 @@
backports: use old led api on old kernel versions.
Usage of a new led api was introduced in mac80211, this patch make
backports use the old api on older kernel versions. This could cause a
problem with the led, the transmit led could stay on if nothing is
transfered.
This backports the following upstream commit:
commit e47f2509e5f182f4df144406de6f2bc78179d57e
Author: Fabio Baltieri <fabio.baltieri@gmail.com>
Date: Thu Jul 25 12:00:26 2013 +0200
mac80211: use oneshot blink API for LED triggers
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1122,6 +1122,9 @@ struct ieee80211_local {
u32 dot11TransmittedFrameCount;
#ifdef CPTCFG_MAC80211_LEDS
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+ int tx_led_counter, rx_led_counter;
+#endif
struct led_trigger *tx_led, *rx_led, *assoc_led, *radio_led;
struct tpt_led_trigger *tpt_led_trigger;
char tx_led_name[32], rx_led_name[32],
--- a/net/mac80211/led.c
+++ b/net/mac80211/led.c
@@ -16,18 +16,36 @@
void ieee80211_led_rx(struct ieee80211_local *local)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
unsigned long led_delay = MAC80211_BLINK_DELAY;
+#endif
if (unlikely(!local->rx_led))
return;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
led_trigger_blink_oneshot(local->rx_led, &led_delay, &led_delay, 0);
+#else
+ if (local->rx_led_counter++ % 2 == 0)
+ led_trigger_event(local->rx_led, LED_OFF);
+ else
+ led_trigger_event(local->rx_led, LED_FULL);
+#endif
}
void ieee80211_led_tx(struct ieee80211_local *local)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
unsigned long led_delay = MAC80211_BLINK_DELAY;
+#endif
if (unlikely(!local->tx_led))
return;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
led_trigger_blink_oneshot(local->tx_led, &led_delay, &led_delay, 0);
+#else
+ if (local->tx_led_counter++ % 2 == 0)
+ led_trigger_event(local->tx_led, LED_OFF);
+ else
+ led_trigger_event(local->tx_led, LED_FULL);
+#endif
}
void ieee80211_led_assoc(struct ieee80211_local *local, bool associated)