projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to wireless-testing 2014-05-22
[openwrt/openwrt.git]
/
package
/
kernel
/
mac80211
/
patches
/
530-ath9k_extra_leds.patch
diff --git
a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
index 41081dcb6a169a15ed7a2ca3b46cb067bb9710e6..b5f2f8b66b0dcce05ae3186c8a692d93cfec07fa 100644
(file)
--- a/
package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
+++ b/
package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -5
58,6 +558,9 @@ struct ath9k_wow_pattern {
+@@ -5
64,6 +564,9 @@ static inline int ath9k_dump_btcoex(stru
void ath_init_leds(struct ath_softc *sc);
void ath_deinit_leds(struct ath_softc *sc);
void ath_fill_led_pin(struct ath_softc *sc);
void ath_init_leds(struct ath_softc *sc);
void ath_deinit_leds(struct ath_softc *sc);
void ath_fill_led_pin(struct ath_softc *sc);
@@
-10,9
+10,9
@@
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
-@@ -7
33,6 +736,13 @@ enum spectral_mode {
- SPECTRAL_CHANSCAN,
- };
+@@ -7
02,6 +705,13 @@ void ath_ant_comb_scan(struct ath_softc
+ #define PS_BEACON_SYNC BIT(4)
+ #define PS_WAIT_FOR_ANI BIT(5)
+struct ath_led {
+ struct list_head list;
+struct ath_led {
+ struct list_head list;
@@
-24,8
+24,8
@@
struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
-@@ -7
75,9 +785
,8 @@ struct ath_softc {
- struct
ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]
;
+@@ -7
44,9 +754
,8 @@ struct ath_softc {
+ struct
ath_beacon beacon
;
#ifdef CPTCFG_MAC80211_LEDS
- bool led_registered;
#ifdef CPTCFG_MAC80211_LEDS
- bool led_registered;
@@
-162,7
+162,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
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
-@@ -
1016,7 +1016
,7 @@ int ath9k_init_device(u16 devid, struct
+@@ -
815,7 +815
,7 @@ int ath9k_init_device(u16 devid, struct
#ifdef CPTCFG_MAC80211_LEDS
/* must be initialized before ieee80211_register_hw */
#ifdef CPTCFG_MAC80211_LEDS
/* must be initialized before ieee80211_register_hw */
@@
-173,7
+173,7
@@
#endif
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
#endif
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1
874,6 +1874
,61 @@ static const struct file_operations fops
+@@ -1
381,6 +1381
,61 @@ static const struct file_operations fops
.llseek = default_llseek,
};
.llseek = default_llseek,
};
@@
-235,7
+235,7
@@
int ath9k_init_debug(struct ath_hw *ah)
{
int ath9k_init_debug(struct ath_hw *ah)
{
-@@ -1
897,6 +1952
,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1
405,6 +1460
,10 @@ int ath9k_init_debug(struct ath_hw *ah)
&fops_eeprom);
debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
sc, &fops_chanbw);
&fops_eeprom);
debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
sc, &fops_chanbw);