compat-wireless: refresh crap patches

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch
index 264a8c3a582a10ba14143d636bf7d580f0a1f1b6..f1dad5ea2ab5d7feca40270709cd36a0236e4f31 100644 (file)
--- a/crap/0002-ath9k-Add-pktlog-support.patch
+++ b/crap/0002-ath9k-Add-pktlog-support.patch
@@ -161,7 +161,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds,
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2442,7 +2442,7 @@ void ath9k_hw_setrxfilter(struct ath_hw 
+@@ -2443,7 +2443,7 @@ void ath9k_hw_setrxfilter(struct ath_hw 
                phybits |= AR_PHY_ERR_RADAR;
        if (bits & ATH9K_RX_FILTER_PHYERR)
                phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING;
@@ -1223,7 +1223,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
 +#endif
 --- a/drivers/net/wireless/ath/ath9k/rc.c
 +++ b/drivers/net/wireless/ath/ath9k/rc.c
-@@ -514,7 +514,7 @@ static u8 ath_rc_setvalid_htrates(struct
+@@ -610,7 +610,7 @@ static u8 ath_rc_setvalid_htrates(struct
  static u8 ath_rc_get_highest_rix(struct ath_softc *sc,
                                 struct ath_rate_priv *ath_rc_priv,
                                 const struct ath_rate_table *rate_table,
@@ -1232,7 +1232,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  {
        u32 best_thruput, this_thruput, now_msec;
        u8 rate, next_rate, best_rate, maxindex, minindex;
-@@ -602,6 +602,8 @@ static u8 ath_rc_get_highest_rix(struct 
+@@ -701,6 +701,8 @@ static u8 ath_rc_get_highest_rix(struct 
  
        rate = ath_rc_priv->valid_rate_index[0];
  
@@ -1241,7 +1241,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
        return rate;
  }
  
-@@ -693,7 +695,7 @@ static void ath_get_rate(void *priv, str
+@@ -792,7 +794,7 @@ static void ath_get_rate(void *priv, str
        try_per_rate = 4;
  
        rate_table = sc->cur_rate_table;
@@ -1250,7 +1250,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
        /*
         * If we're in HT mode and both us and our peer supports LDPC.
-@@ -933,7 +935,8 @@ static bool ath_rc_update_per(struct ath
+@@ -1032,7 +1034,8 @@ static bool ath_rc_update_per(struct ath
  static void ath_rc_update_ht(struct ath_softc *sc,
                             struct ath_rate_priv *ath_rc_priv,
                             struct ieee80211_tx_info *tx_info,
@@ -1260,7 +1260,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  {
        u32 now_msec = jiffies_to_msecs(jiffies);
        int rate;
-@@ -1002,6 +1005,9 @@ static void ath_rc_update_ht(struct ath_
+@@ -1101,6 +1104,9 @@ static void ath_rc_update_ht(struct ath_
        ath_debug_stat_retries(sc, tx_rate, xretries, retries,
                               ath_rc_priv->per[tx_rate]);
  
@@ -1270,7 +1270,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  }
  
  static int ath_rc_get_rateindex(const struct ath_rate_table *rate_table,
-@@ -1029,7 +1035,8 @@ static int ath_rc_get_rateindex(const st
+@@ -1133,7 +1139,8 @@ static int ath_rc_get_rateindex(const st
  static void ath_rc_tx_status(struct ath_softc *sc,
                             struct ath_rate_priv *ath_rc_priv,
                             struct ieee80211_tx_info *tx_info,
@@ -1280,7 +1280,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  {
        const struct ath_rate_table *rate_table;
        struct ieee80211_tx_rate *rates = tx_info->status.rates;
-@@ -1058,7 +1065,7 @@ static void ath_rc_tx_status(struct ath_
+@@ -1162,7 +1169,7 @@ static void ath_rc_tx_status(struct ath_
                                rix = ath_rc_get_rateindex(rate_table, &rates[i]);
                                ath_rc_update_ht(sc, ath_rc_priv, tx_info,
                                                rix, xretries ? 1 : 2,
@@ -1289,7 +1289,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
                        }
                }
        } else {
-@@ -1080,7 +1087,7 @@ static void ath_rc_tx_status(struct ath_
+@@ -1184,7 +1191,7 @@ static void ath_rc_tx_status(struct ath_
                return;
  
        rix = ath_rc_get_rateindex(rate_table, &rates[i]);
@@ -1298,7 +1298,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  }
  
  static const
-@@ -1274,7 +1281,8 @@ static void ath_tx_status(void *priv, st
+@@ -1379,7 +1386,8 @@ static void ath_tx_status(void *priv, st
                tx_status = 1;
  
        ath_rc_tx_status(sc, ath_rc_priv, tx_info, final_ts_idx, tx_status,
@@ -1346,7 +1346,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
                bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data,
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -437,6 +437,8 @@ static void ath_tx_complete_aggr(struct 
+@@ -448,6 +448,8 @@ static void ath_tx_complete_aggr(struct 
                        list_move_tail(&bf->list, &bf_head);
                }
  
@@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
                if (!txpending) {
                        /*
                         * complete the acked-ones/xretried ones; update
-@@ -2120,7 +2122,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2131,7 +2133,7 @@ static void ath_tx_processq(struct ath_s
                ds = lastbf->bf_desc;
  
                memset(&ts, 0, sizeof(ts));
@@ -1364,7 +1364,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
                if (status == -EINPROGRESS) {
                        spin_unlock_bh(&txq->axq_lock);
                        break;
-@@ -2169,10 +2171,14 @@ static void ath_tx_processq(struct ath_s
+@@ -2180,10 +2182,14 @@ static void ath_tx_processq(struct ath_s
                        ath_tx_rc_status(bf, &ts, 0, txok, true);
                }
  
@@ -1381,7 +1381,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
                ath_wake_mac80211_queue(sc, txq);
  
-@@ -2244,9 +2250,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2255,9 +2261,11 @@ void ath_tx_edma_tasklet(struct ath_soft
        struct list_head bf_head;
        int status;
        int txok;
@@ -1394,7 +1394,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
                if (status == -EINPROGRESS)
                        break;
                if (status == -EIO) {
-@@ -2298,14 +2306,18 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2309,14 +2317,18 @@ void ath_tx_edma_tasklet(struct ath_soft
                        ath_tx_rc_status(bf, &txs, 0, txok, true);
                }