mac80211: update to latest wireless-testing + some monitor mode fixes and some libertas driver fixes

SVN-Revision: 32760
This commit is contained in:
Felix Fietkau
2012-07-16 23:50:54 +00:00
parent 84585b45d6
commit cf9bca8ded
39 changed files with 2503 additions and 3507 deletions

View File

@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -528,6 +528,9 @@ static inline void ath9k_btcoex_stop_gen
@@ -537,6 +537,9 @@ struct ath9k_wow_pattern {
#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)
{
@@ -645,6 +648,13 @@ struct ath9k_vif_iter_data {
@@ -654,6 +657,13 @@ struct ath9k_vif_iter_data {
int nadhocs; /* number of adhoc vifs */
};
@@ -24,7 +24,7 @@
struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
@@ -686,9 +696,8 @@ struct ath_softc {
@@ -695,9 +705,8 @@ struct ath_softc {
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
@@ -792,7 +792,7 @@ int ath9k_init_device(u16 devid, struct
@@ -811,7 +811,7 @@ int ath9k_init_device(u16 devid, struct
#ifdef CONFIG_MAC80211_LEDS
/* must be initialized before ieee80211_register_hw */
@@ -244,7 +244,7 @@
#ifdef CONFIG_ATH9K_MAC_DEBUG
void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
@@ -1680,6 +1735,11 @@ int ath9k_init_debug(struct ath_hw *ah)
@@ -1688,6 +1743,11 @@ int ath9k_init_debug(struct ath_hw *ah)
&fops_samps);
#endif