projects
/
openwrt
/
svn-archive
/
archive.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 2012-06-14
[openwrt/svn-archive/archive.git]
/
package
/
mac80211
/
patches
/
540-ath9k_extra_leds.patch
diff --git
a/package/mac80211/patches/540-ath9k_extra_leds.patch
b/package/mac80211/patches/540-ath9k_extra_leds.patch
index 30094cd53a4ab0c5e93bc8164f7eb9ec9afff5aa..c0a7317164bed9dee17cedb6033b08ebab3df754 100644
(file)
--- a/
package/mac80211/patches/540-ath9k_extra_leds.patch
+++ b/
package/mac80211/patches/540-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
07,6 +507
,9 @@ static inline u16 ath9k_btcoex_aggr_limi
+@@ -5
23,6 +523
,9 @@ static inline u16 ath9k_btcoex_aggr_limi
#ifdef CONFIG_MAC80211_LEDS
void ath_init_leds(struct ath_softc *sc);
void ath_deinit_leds(struct ath_softc *sc);
#ifdef CONFIG_MAC80211_LEDS
void ath_init_leds(struct ath_softc *sc);
void ath_deinit_leds(struct ath_softc *sc);
@@
-10,7
+10,7
@@
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
-@@ -6
20,6 +623
,13 @@ struct ath9k_vif_iter_data {
+@@ -6
41,6 +644
,13 @@ struct ath9k_vif_iter_data {
int nadhocs; /* number of adhoc vifs */
};
int nadhocs; /* number of adhoc vifs */
};
@@
-24,7
+24,7
@@
struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
-@@ -6
61,9 +671
,8 @@ struct ath_softc {
+@@ -6
82,9 +692
,8 @@ struct ath_softc {
struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
#ifdef CONFIG_MAC80211_LEDS
struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
#ifdef CONFIG_MAC80211_LEDS
@@
-171,7
+171,7
@@
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -7
81,7 +781
,7 @@ int ath9k_init_device(u16 devid, struct
+@@ -7
92,7 +792
,7 @@ int ath9k_init_device(u16 devid, struct
#ifdef CONFIG_MAC80211_LEDS
/* must be initialized before ieee80211_register_hw */
#ifdef CONFIG_MAC80211_LEDS
/* must be initialized before ieee80211_register_hw */
@@
-182,7
+182,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
-@@ -125
5,6 +1255
,61 @@ static const struct file_operations fops
+@@ -125
6,6 +1256
,61 @@ static const struct file_operations fops
.llseek = default_llseek,
};
.llseek = default_llseek,
};
@@
-244,7
+244,7
@@
#ifdef CONFIG_ATH9K_MAC_DEBUG
void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
#ifdef CONFIG_ATH9K_MAC_DEBUG
void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
-@@ -168
4,6 +1739
,11 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -168
5,6 +1740
,11 @@ int ath9k_init_debug(struct ath_hw *ah)
&fops_samps);
#endif
&fops_samps);
#endif