ath9k: fix a compile error

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28116 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/mac80211/patches/581-ath9k_merge_reset_functions.patch b/package/mac80211/patches/581-ath9k_merge_reset_functions.patch
index 6262d42..6159284 100644 (file)
--- a/package/mac80211/patches/581-ath9k_merge_reset_functions.patch
+++ b/package/mac80211/patches/581-ath9k_merge_reset_functions.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -212,83 +212,46 @@ static int ath_update_survey_stats(struc
+@@ -212,83 +212,47 @@ static int ath_update_survey_stats(struc
        return ret;
  }
  
@@ -14,7 +14,7 @@
 +static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
  {
        struct ath_hw *ah = sc->sc_ah;
--      struct ath_common *common = ath9k_hw_common(ah);
+       struct ath_common *common = ath9k_hw_common(ah);
 -      struct ieee80211_conf *conf = &common->hw->conf;
 -      bool fastcc = true, stopped;
 -      struct ieee80211_channel *channel = hw->conf.channel;
@@ -49,14 +49,14 @@
 -       */
        ath9k_hw_disable_interrupts(ah);
 -      stopped = ath_drain_all_txq(sc, false);
- 
+-
 -      if (!ath_stoprecv(sc))
 -              stopped = false;
-+      ret = ath_drain_all_txq(sc, retry_tx);
  
 -      if (!ath9k_hw_check_alive(ah))
 -              stopped = false;
--
++      ret = ath_drain_all_txq(sc, retry_tx);
+ 
 -      /* XXX: do not flush receive queue here. We don't want
 -       * to flush data frames already in queue because of
 -       * changing channel. */
@@ -104,7 +104,7 @@
        }
  
        ath9k_cmn_update_txpow(ah, sc->curtxpow,
-@@ -296,21 +259,89 @@ static int ath_set_channel(struct ath_so
+@@ -296,21 +260,89 @@ static int ath_set_channel(struct ath_so
        ath9k_hw_set_interrupts(ah, ah->imask);
        ath9k_hw_enable_interrupts(ah);
  
@@ -125,7 +125,7 @@
 +
 +      return true;
 +}
- 
++
 +static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
 +                            bool retry_tx)
 +{
@@ -182,7 +182,7 @@
 +                  struct ath9k_channel *hchan)
 +{
 +      int r;
-+
+ 
 +      if (sc->sc_flags & SC_OP_INVALID)
 +              return -EIO;
 +
@@ -197,7 +197,7 @@
        return r;
  }
  
-@@ -893,28 +924,13 @@ static void ath_radio_enable(struct ath_
+@@ -893,28 +925,13 @@ static void ath_radio_enable(struct ath_
                        channel->center_freq, r);
        }
  
@@ -227,7 +227,7 @@
        spin_unlock_bh(&sc->sc_pcu_lock);
  
        ath9k_ps_restore(sc);
-@@ -927,12 +943,8 @@ void ath_radio_disable(struct ath_softc 
+@@ -927,12 +944,8 @@ void ath_radio_disable(struct ath_softc 
        int r;
  
        ath9k_ps_wakeup(sc);
@@ -240,7 +240,7 @@
        /*
         * Keep the LED on when the radio is disabled
         * during idle unassociated state.
-@@ -942,13 +954,7 @@ void ath_radio_disable(struct ath_softc 
+@@ -942,13 +955,7 @@ void ath_radio_disable(struct ath_softc 
                ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
        }
  
@@ -255,7 +255,7 @@
  
        if (!ah->curchan)
                ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
-@@ -970,48 +976,11 @@ void ath_radio_disable(struct ath_softc 
+@@ -970,48 +977,11 @@ void ath_radio_disable(struct ath_softc 
  
  int ath_reset(struct ath_softc *sc, bool retry_tx)
  {
@@ -305,7 +305,7 @@
  
        if (retry_tx) {
                int i;
-@@ -1024,12 +993,6 @@ int ath_reset(struct ath_softc *sc, bool
+@@ -1024,12 +994,6 @@ int ath_reset(struct ath_softc *sc, bool
                }
        }
  
@@ -318,7 +318,7 @@
        ath9k_ps_restore(sc);
  
        return r;
-@@ -1081,28 +1044,6 @@ static int ath9k_start(struct ieee80211_
+@@ -1081,28 +1045,6 @@ static int ath9k_start(struct ieee80211_
                goto mutex_unlock;
        }
  
@@ -347,7 +347,7 @@
        /* Setup our intr mask. */
        ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL |
                    ATH9K_INT_RXORN | ATH9K_INT_FATAL |
-@@ -1125,12 +1066,14 @@ static int ath9k_start(struct ieee80211_
+@@ -1125,12 +1067,14 @@ static int ath9k_start(struct ieee80211_
  
        /* Disable BMISS interrupt when we're not associated */
        ah->imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);

diff --git a/package/mac80211/patches/582-ath9k_antenna_control.patch b/package/mac80211/patches/582-ath9k_antenna_control.patch
index 9445546..2e2bbea 100644 (file)
--- a/package/mac80211/patches/582-ath9k_antenna_control.patch
+++ b/package/mac80211/patches/582-ath9k_antenna_control.patch
@@ -75,7 +75,7 @@
  bool ath9k_uses_beacons(int type);
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -269,6 +269,22 @@ static bool ath_complete_reset(struct at
+@@ -270,6 +270,22 @@ static bool ath_complete_reset(struct at
                        ath_start_ani(common);
        }
  
@@ -98,7 +98,7 @@
        ieee80211_wake_queues(sc->hw);
  
        return true;
-@@ -2365,6 +2381,59 @@ static int ath9k_get_stats(struct ieee80
+@@ -2366,6 +2382,59 @@ static int ath9k_get_stats(struct ieee80
        return 0;
  }
  
@@ -158,7 +158,7 @@
  struct ieee80211_ops ath9k_ops = {
        .tx                 = ath9k_tx,
        .start              = ath9k_start,
-@@ -2391,4 +2460,6 @@ struct ieee80211_ops ath9k_ops = {
+@@ -2392,4 +2461,6 @@ struct ieee80211_ops ath9k_ops = {
        .tx_frames_pending  = ath9k_tx_frames_pending,
        .tx_last_beacon     = ath9k_tx_last_beacon,
        .get_stats          = ath9k_get_stats,