compat-wireless: refresh crap patches
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 13 Jul 2010 21:07:23 +0000 (14:07 -0700)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 13 Jul 2010 21:07:23 +0000 (14:07 -0700)
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
crap/0002-ath9k-Add-pktlog-support.patch

index 259c2d48a5d46d6b6fa39e8853c469d13accc56c..264a8c3a582a10ba14143d636bf7d580f0a1f1b6 100644 (file)
@@ -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
-@@ -2440,7 +2440,7 @@ void ath9k_hw_setrxfilter(struct ath_hw 
+@@ -2442,7 +2442,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
-@@ -603,7 +603,7 @@ struct ath_hw_ops {
+@@ -601,7 +601,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,
-@@ -831,6 +831,8 @@ struct ath_hw {
+@@ -830,6 +830,8 @@ struct ath_hw {
         * this register when in sleep states.
         */
        u32 WARegVal;
@@ -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
-@@ -429,6 +429,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);
                }
  
@@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
                if (!txpending) {
                        /*
                         * complete the acked-ones/xretried ones; update
-@@ -2112,7 +2114,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2120,7 +2122,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;
-@@ -2161,10 +2163,14 @@ static void ath_tx_processq(struct ath_s
+@@ -2169,10 +2171,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);
  
-@@ -2236,9 +2242,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2244,9 +2250,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) {
-@@ -2290,14 +2298,18 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2298,14 +2306,18 @@ void ath_tx_edma_tasklet(struct ath_soft
                        ath_tx_rc_status(bf, &txs, 0, txok, true);
                }