mac80211: update to wireless-testing 2010-12-16
SVN-Revision: 24655
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
@@ -438,26 +438,20 @@ void ath9k_btcoex_timer_pause(struct ath
|
||||
@@ -441,26 +441,20 @@ void ath9k_btcoex_timer_pause(struct ath
|
||||
|
||||
#define ATH_LED_PIN_DEF 1
|
||||
#define ATH_LED_PIN_9287 8
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
/* Antenna diversity/combining */
|
||||
#define ATH_ANT_RX_CURRENT_SHIFT 4
|
||||
@@ -608,15 +602,11 @@ struct ath_softc {
|
||||
@@ -611,15 +605,11 @@ struct ath_softc {
|
||||
struct ath_beacon beacon;
|
||||
struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
/* Rfkill */
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -1275,9 +1275,6 @@ static void ath9k_stop(struct ieee80211_
|
||||
@@ -1295,9 +1295,6 @@ static void ath9k_stop(struct ieee80211_
|
||||
|
||||
aphy->state = ATH_WIPHY_INACTIVE;
|
||||
|
||||
@@ -265,7 +265,7 @@
|
||||
cancel_work_sync(&sc->hw_check_work);
|
||||
--- a/drivers/net/wireless/ath/ath9k/init.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
||||
@@ -139,6 +139,21 @@ static struct ieee80211_rate ath9k_legac
|
||||
@@ -143,6 +143,21 @@ static struct ieee80211_rate ath9k_legac
|
||||
RATE(540, 0x0c, 0),
|
||||
};
|
||||
|
||||
@@ -287,14 +287,15 @@
|
||||
static void ath9k_deinit_softc(struct ath_softc *sc);
|
||||
|
||||
/*
|
||||
@@ -742,6 +757,12 @@ int ath9k_init_device(u16 devid, struct
|
||||
@@ -746,6 +761,13 @@ int ath9k_init_device(u16 devid, struct
|
||||
|
||||
ath9k_init_txpower_limits(sc);
|
||||
|
||||
+#ifdef CONFIG_MAC80211_LEDS
|
||||
+ /* must be initialized before ieee80211_register_hw */
|
||||
+ sc->led_cdev.default_trigger = ieee80211_create_tpt_led_trigger(sc->hw,
|
||||
+ ath9k_tpt_blink, ARRAY_SIZE(ath9k_tpt_blink));
|
||||
+ IEEE80211_TPT_LEDTRIG_FL_RADIO, ath9k_tpt_blink,
|
||||
+ ARRAY_SIZE(ath9k_tpt_blink));
|
||||
+#endif
|
||||
+
|
||||
/* Register with mac80211 */
|
||||
|
||||
Reference in New Issue
Block a user