compat-wireless: refresh crap patches
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 24 Aug 2010 00:08:37 +0000 (17:08 -0700)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 24 Aug 2010 00:08:37 +0000 (17:08 -0700)
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
crap/0002-ath9k-Add-pktlog-support.patch

index 48a8daad270600854451e29be2ffbe37ee92e22e..d8e4b6893b552a99ade15e321bce48469e7896d5 100644 (file)
@@ -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
-@@ -521,6 +522,7 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -514,6 +515,7 @@ void ath_deinit_leds(struct ath_softc *s
  #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)
-@@ -599,6 +601,10 @@ struct ath_softc {
+@@ -592,6 +594,10 @@ struct ath_softc {
  #ifdef CONFIG_ATH9K_DEBUGFS
        struct ath9k_debug debug;
  #endif
@@ -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
-@@ -607,7 +607,7 @@ struct ath_hw_ops {
+@@ -608,7 +608,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,
-@@ -836,6 +836,8 @@ struct ath_hw {
+@@ -837,6 +837,8 @@ struct ath_hw {
         * this register when in sleep states.
         */
        u32 WARegVal;
@@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
                if (!txpending) {
                        /*
                         * complete the acked-ones/xretried ones; update
-@@ -2113,7 +2115,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2097,7 +2099,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;
-@@ -2162,10 +2164,14 @@ static void ath_tx_processq(struct ath_s
+@@ -2146,10 +2148,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);
  
-@@ -2237,9 +2243,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2221,9 +2227,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) {
-@@ -2291,14 +2299,18 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2275,14 +2283,18 @@ void ath_tx_edma_tasklet(struct ath_soft
                        ath_tx_rc_status(bf, &txs, 0, txok, true);
                }