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 6662a44b042634336500e9c150cfa68e079ef76a..c882d1464b7c0a2984deb42935c94f6b88bbf0d9 100644 (file)
--- a/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch
+++ b/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  #ifdef CONFIG_ATH_DEBUG
  
  static ssize_t read_file_debug(struct file *file, char __user *user_buf,
-@@ -941,6 +955,40 @@ static const struct file_operations fops
+@@ -961,6 +975,40 @@ static const struct file_operations fops
        .llseek = default_llseek,
  };
  
@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);
-@@ -1005,6 +1053,11 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1025,6 +1073,11 @@ int ath9k_init_debug(struct ath_hw *ah)
                goto err;
  
        sc->debug.regidx = 0;
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        return 0;
  err:
        ath9k_exit_debug(ah);
-@@ -1016,6 +1069,7 @@ void ath9k_exit_debug(struct ath_hw *ah)
+@@ -1036,6 +1089,7 @@ void ath9k_exit_debug(struct ath_hw *ah)
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath_softc *sc = (struct ath_softc *) common->priv;
  
@@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
 --- a/drivers/net/wireless/ath/ath9k/debug.h
 +++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -156,6 +156,14 @@ struct ath_stats {
+@@ -168,6 +168,14 @@ struct ath_stats {
  struct ath9k_debug {
        struct dentry *debugfs_phy;
        u32 regidx;

diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch
index 1c47a83152aa5684adc16572b20e95cddbcd273f..ada8850a1aa0dc2d07b7d50ac1f28a858e0944ea 100644 (file)
--- a/crap/0002-ath9k-Add-pktlog-support.patch
+++ b/crap/0002-ath9k-Add-pktlog-support.patch
@@ -105,7 +105,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  /*
   * Header for the ath9k.ko driver core *only* -- hw code nor any other driver
-@@ -566,6 +567,7 @@ struct ath_ant_comb {
+@@ -564,6 +565,7 @@ struct ath_ant_comb {
  #define SC_OP_BT_PRIORITY_DETECTED   BIT(12)
  #define SC_OP_BT_SCAN              BIT(13)
  #define SC_OP_ANI_RUN              BIT(14)
@@ -113,7 +113,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  /* Powersave flags */
  #define PS_WAIT_FOR_BEACON        BIT(0)
-@@ -644,6 +646,10 @@ struct ath_softc {
+@@ -642,6 +644,10 @@ struct ath_softc {
  #ifdef CONFIG_ATH9K_DEBUGFS
        struct ath9k_debug debug;
  #endif
@@ -126,7 +126,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
        struct ath_btcoex btcoex;
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1058,6 +1058,9 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1078,6 +1078,9 @@ int ath9k_init_debug(struct ath_hw *ah)
                        sc, &fops_regdump))
                goto err;
  
@@ -136,7 +136,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
        return 0;
  err:
        ath9k_exit_debug(ah);
-@@ -1069,6 +1072,7 @@ void ath9k_exit_debug(struct ath_hw *ah)
+@@ -1089,6 +1092,7 @@ void ath9k_exit_debug(struct ath_hw *ah)
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath_softc *sc = (struct ath_softc *) common->priv;
  
@@ -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
-@@ -2166,7 +2166,7 @@ void ath9k_hw_setrxfilter(struct ath_hw 
+@@ -2155,7 +2155,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;
@@ -172,7 +172,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
                REG_WRITE(ah, AR_RXCFG,
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -604,7 +604,7 @@ struct ath_hw_ops {
+@@ -584,7 +584,7 @@ struct ath_hw_ops {
                            const void *ds0, dma_addr_t buf_addr,
                            unsigned int qcu);
        int (*proc_txdesc)(struct ath_hw *ah, void *ds,
@@ -181,7 +181,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
        void (*set11n_txdesc)(struct ath_hw *ah, void *ds,
                              u32 pktLen, enum ath9k_pkt_type type,
                              u32 txPower, u32 keyIx,
-@@ -833,6 +833,8 @@ struct ath_hw {
+@@ -807,6 +807,8 @@ struct ath_hw {
         * this register when in sleep states.
         */
        u32 WARegVal;
@@ -1298,7 +1298,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  }
  
  static const
-@@ -1395,7 +1402,8 @@ static void ath_tx_status(void *priv, st
+@@ -1401,7 +1408,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,
@@ -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
-@@ -1628,6 +1628,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1627,6 +1627,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
-@@ -1720,12 +1721,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1719,12 +1720,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
-@@ -435,6 +435,8 @@ static void ath_tx_complete_aggr(struct 
+@@ -437,6 +437,8 @@ static void ath_tx_complete_aggr(struct 
                        list_move_tail(&bf->list, &bf_head);
                }
  
@@ -1364,8 +1364,8 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
                if (status == -EINPROGRESS) {
                        spin_unlock_bh(&txq->axq_lock);
                        break;
-@@ -2124,10 +2126,14 @@ static void ath_tx_processq(struct ath_s
-                       ath_tx_rc_status(bf, &ts, 0, txok, true);
+@@ -2112,10 +2114,14 @@ static void ath_tx_processq(struct ath_s
+                       ath_tx_rc_status(bf, &ts, txok ? 0 : 1, txok, true);
                }
  
 -              if (bf_isampdu(bf))
@@ -1381,7 +1381,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
                ath_wake_mac80211_queue(sc, txq);
  
-@@ -2199,9 +2205,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2187,9 +2193,11 @@ void ath_tx_edma_tasklet(struct ath_soft
        struct list_head bf_head;
        int status;
        int txok;
@@ -1394,8 +1394,8 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
                if (status == -EINPROGRESS)
                        break;
                if (status == -EIO) {
-@@ -2253,14 +2261,18 @@ void ath_tx_edma_tasklet(struct ath_soft
-                       ath_tx_rc_status(bf, &txs, 0, txok, true);
+@@ -2230,14 +2238,18 @@ void ath_tx_edma_tasklet(struct ath_soft
+                       ath_tx_rc_status(bf, &txs, txok ? 0 : 1, txok, true);
                }
  
 -              if (bf_isampdu(bf))