summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: be0862e)
raw | patch | inline | side by side (parent: be0862e)
author | Luis R. Rodriguez <lrodriguez@atheros.com> | |
Thu, 4 Nov 2010 21:41:57 +0000 (14:41 -0700) | ||
committer | Luis R. Rodriguez <lrodriguez@atheros.com> | |
Thu, 4 Nov 2010 21:41:57 +0000 (14:41 -0700) |
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
crap/0002-ath9k-Add-pktlog-support.patch | patch | blob | history |
index 4d79125ea88e1eae20d95697c247dd9e35a98312..c00f5219a7978a98a5d79f6a7342aaacc1e93aee 100644 (file)
if (conf_is_ht(&sc->hw->conf) &&
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -1630,6 +1630,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1629,6 +1629,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);
/*
* The hw can techncically differ from common->hw when using ath9k
* virtual wiphy so to account for that we iterate over the active
-@@ -1722,12 +1723,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1721,12 +1722,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
dma_type);
skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);
if (!txpending || (tid->state & AGGR_CLEANUP)) {
/*
* complete the acked-ones/xretried ones; update
-@@ -2078,7 +2080,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2084,7 +2086,7 @@ static void ath_tx_processq(struct ath_s
ds = lastbf->bf_desc;
memset(&ts, 0, sizeof(ts));
if (status == -EINPROGRESS) {
spin_unlock_bh(&txq->axq_lock);
break;
-@@ -2115,10 +2117,14 @@ static void ath_tx_processq(struct ath_s
+@@ -2121,10 +2123,14 @@ static void ath_tx_processq(struct ath_s
ath_tx_rc_status(bf, &ts, txok ? 0 : 1, txok, true);
}
ath_wake_mac80211_queue(sc, txq);
-@@ -2190,9 +2196,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2196,9 +2202,11 @@ void ath_tx_edma_tasklet(struct ath_soft
struct list_head bf_head;
int status;
int txok;
if (status == -EINPROGRESS)
break;
if (status == -EIO) {
-@@ -2233,14 +2241,18 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2239,14 +2247,18 @@ void ath_tx_edma_tasklet(struct ath_soft
ath_tx_rc_status(bf, &txs, txok ? 0 : 1, txok, true);
}