compat-wireless: refresh crap patches

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

diff --git a/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch b/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch
index 08f56a161340a72dd170b796d4180ca96589b6f7..6662a44b042634336500e9c150cfa68e079ef76a 100644 (file)
--- a/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch
+++ b/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch
@@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
  static ssize_t read_file_debug(struct file *file, char __user *user_buf,
 @@ -941,6 +955,40 @@ static const struct file_operations fops
-       .llseek = default_llseek,/* read accesses f_pos */
+       .llseek = default_llseek,
  };
  
 +#define REGDUMP_LINE_SIZE     20

diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch
index af85bdfe921dcfa2f16516c6512eda89cb88983b..1c47a83152aa5684adc16572b20e95cddbcd273f 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
-@@ -2167,7 +2167,7 @@ void ath9k_hw_setrxfilter(struct ath_hw 
+@@ -2166,7 +2166,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;
@@ -1310,7 +1310,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
        if (conf_is_ht(&sc->hw->conf) &&
 --- a/drivers/net/wireless/ath/ath9k/recv.c
 +++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -1624,6 +1624,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1628,6 +1628,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
        struct ieee80211_rx_status *rxs;
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(ah);
@@ -1318,7 +1318,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
        /*
         * The hw can techncically differ from common->hw when using ath9k
         * virtual wiphy so to account for that we iterate over the active
-@@ -1716,12 +1717,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1720,12 +1721,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
                                 dma_type);
  
                skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);
@@ -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
-@@ -436,6 +436,8 @@ static void ath_tx_complete_aggr(struct 
+@@ -435,6 +435,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 || (tid->state & AGGR_CLEANUP)) {
                        /*
                         * complete the acked-ones/xretried ones; update
-@@ -2076,7 +2078,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2075,7 +2077,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;
-@@ -2125,10 +2127,14 @@ static void ath_tx_processq(struct ath_s
+@@ -2124,10 +2126,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);
  
-@@ -2200,9 +2206,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2199,9 +2205,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) {
-@@ -2254,14 +2262,18 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2253,14 +2261,18 @@ void ath_tx_edma_tasklet(struct ath_soft
                        ath_tx_rc_status(bf, &txs, 0, txok, true);
                }