generic: ar8216: improve ar8216_wait_bit function

[openwrt.git] / package / mac80211 / patches / 571-ath9k_beacon_fix.patch

diff --git a/package/mac80211/patches/571-ath9k_beacon_fix.patch b/package/mac80211/patches/571-ath9k_beacon_fix.patch
index e7c2b00..96b8060 100644 (file)
--- a/package/mac80211/patches/571-ath9k_beacon_fix.patch
+++ b/package/mac80211/patches/571-ath9k_beacon_fix.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c

-@@ -346,7 +346,6 @@ static bool ar9003_hw_get_isr(struct ath
+@@ -326,7 +326,6 @@ static bool ar9003_hw_get_isr(struct ath

  static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
                                 struct ath_tx_status *ts)
  {
  static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
                                 struct ath_tx_status *ts)
  {


@@ -8,7 +8,7 @@
        struct ar9003_txs *ads;
        u32 status;
  
        struct ar9003_txs *ads;
        u32 status;
  

-@@ -356,11 +355,7 @@ static int ar9003_hw_proc_txdesc(struct 
+@@ -336,11 +335,7 @@ static int ar9003_hw_proc_txdesc(struct 

        if ((status & AR_TxDone) == 0)
                return -EINPROGRESS;
  
        if ((status & AR_TxDone) == 0)
                return -EINPROGRESS;
  


@@ -21,7 +21,7 @@
  
        if ((MS(ads->ds_info, AR_DescId) != ATHEROS_VENDOR_ID) ||
            (MS(ads->ds_info, AR_TxRxDesc) != 1)) {
  
        if ((MS(ads->ds_info, AR_DescId) != ATHEROS_VENDOR_ID) ||
            (MS(ads->ds_info, AR_TxRxDesc) != 1)) {

-@@ -374,6 +369,7 @@ static int ar9003_hw_proc_txdesc(struct 
+@@ -354,6 +349,7 @@ static int ar9003_hw_proc_txdesc(struct 

        ts->ts_seqnum = MS(status, AR_SeqNum);
        ts->tid = MS(status, AR_TxTid);
  
        ts->ts_seqnum = MS(status, AR_SeqNum);
        ts->tid = MS(status, AR_TxTid);
  


@@ -77,7 +77,7 @@
  EXPORT_SYMBOL(ath9k_hw_beaconq_setup);
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
  EXPORT_SYMBOL(ath9k_hw_beaconq_setup);
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c

-@@ -2323,6 +2323,7 @@ static int ath9k_tx_last_beacon(struct i
+@@ -2303,6 +2303,7 @@ static int ath9k_tx_last_beacon(struct i

        struct ath_vif *avp;
        struct ath_buf *bf;
        struct ath_tx_status ts;
        struct ath_vif *avp;
        struct ath_buf *bf;
        struct ath_tx_status ts;


@@ -85,7 +85,7 @@
        int status;
  
        vif = sc->beacon.bslot[0];
        int status;
  
        vif = sc->beacon.bslot[0];

-@@ -2333,7 +2334,7 @@ static int ath9k_tx_last_beacon(struct i
+@@ -2313,7 +2314,7 @@ static int ath9k_tx_last_beacon(struct i

        if (!avp->is_bslot_active)
                return 0;
  
        if (!avp->is_bslot_active)
                return 0;
  


@@ -96,7 +96,7 @@
                bf = avp->av_bcbuf;
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
                bf = avp->av_bcbuf;
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c

-@@ -2318,9 +2318,12 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2317,9 +2317,12 @@ void ath_tx_edma_tasklet(struct ath_soft

                        break;
                }
  
                        break;
                }