Fix whitespace

[openwrt.git] / package / mac80211 / patches / 510-ath9k_led_cleanup.patch

diff --git a/package/mac80211/patches/510-ath9k_led_cleanup.patch b/package/mac80211/patches/510-ath9k_led_cleanup.patch
index be26a88..ded236c 100644 (file)
--- a/package/mac80211/patches/510-ath9k_led_cleanup.patch
+++ b/package/mac80211/patches/510-ath9k_led_cleanup.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

-@@ -441,26 +441,20 @@ void ath9k_btcoex_timer_pause(struct ath
+@@ -449,26 +449,20 @@ void ath9k_btcoex_timer_pause(struct ath

  
  #define ATH_LED_PIN_DEF               1
  #define ATH_LED_PIN_9287              8
  
  #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
  
  /* Antenna diversity/combining */
  #define ATH_ANT_RX_CURRENT_SHIFT 4

-@@ -611,15 +605,11 @@ struct ath_softc {
+@@ -620,15 +614,11 @@ struct ath_softc {

        struct ath_beacon beacon;
        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
  
        struct ath_beacon beacon;
        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
  


@@ -57,8 +57,8 @@
 +      struct led_classdev led_cdev;
 +#endif
  
 +      struct led_classdev led_cdev;
 +#endif
  

-       int beacon_interval;
- 
+       struct ath9k_hw_cal_data caldata;
+       int last_rssi;

 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
 @@ -20,120 +20,25 @@
 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
 @@ -20,120 +20,25 @@


@@ -253,19 +253,19 @@
  /*    Rfkill     */
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
  /*    Rfkill     */
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c

-@@ -1295,9 +1295,6 @@ static void ath9k_stop(struct ieee80211_
+@@ -1204,9 +1204,6 @@ static void ath9k_stop(struct ieee80211_

  
  

-       aphy->state = ATH_WIPHY_INACTIVE;
+       mutex_lock(&sc->mutex);

  
 -      if (led_blink)
 -              cancel_delayed_work_sync(&sc->ath_led_blink_work);
 -
        cancel_delayed_work_sync(&sc->tx_complete_work);
  
 -      if (led_blink)
 -              cancel_delayed_work_sync(&sc->ath_led_blink_work);
 -
        cancel_delayed_work_sync(&sc->tx_complete_work);

+       cancel_delayed_work_sync(&sc->hw_pll_work);

        cancel_work_sync(&sc->paprd_work);
        cancel_work_sync(&sc->paprd_work);

-       cancel_work_sync(&sc->hw_check_work);

 --- 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

-@@ -143,6 +143,21 @@ static struct ieee80211_rate ath9k_legac
+@@ -145,6 +145,21 @@ static struct ieee80211_rate ath9k_legac

        RATE(540, 0x0c, 0),
  };
  
        RATE(540, 0x0c, 0),
  };