Felix Fietkau
11 years ago
parent
bbd4d4c8b8
commit
253d2b511b
@ -1,30 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
|
||||
@@ -241,21 +241,19 @@ static bool ar9003_hw_get_isr(struct ath
|
||||
|
||||
*masked = isr & ATH9K_INT_COMMON;
|
||||
|
||||
- if (ah->config.rx_intr_mitigation)
|
||||
+ if (ah->config.rx_intr_mitigation) {
|
||||
if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM))
|
||||
*masked |= ATH9K_INT_RXLP;
|
||||
-
|
||||
- if (ah->config.tx_intr_mitigation)
|
||||
- if (isr & (AR_ISR_TXMINTR | AR_ISR_TXINTM))
|
||||
- *masked |= ATH9K_INT_TX;
|
||||
-
|
||||
- if (isr & (AR_ISR_LP_RXOK | AR_ISR_RXERR))
|
||||
+ } else if (isr & (AR_ISR_LP_RXOK | AR_ISR_RXERR))
|
||||
*masked |= ATH9K_INT_RXLP;
|
||||
|
||||
if (isr & AR_ISR_HP_RXOK)
|
||||
*masked |= ATH9K_INT_RXHP;
|
||||
|
||||
- if (isr & (AR_ISR_TXOK | AR_ISR_TXERR | AR_ISR_TXEOL)) {
|
||||
+ if (ah->config.tx_intr_mitigation) {
|
||||
+ if (isr & (AR_ISR_TXMINTR | AR_ISR_TXINTM))
|
||||
+ *masked |= ATH9K_INT_TX;
|
||||
+ } else if (isr & (AR_ISR_TXOK | AR_ISR_TXERR | AR_ISR_TXEOL)) {
|
||||
*masked |= ATH9K_INT_TX;
|
||||
|
||||
if (!(pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)) {
|
||||
@ -1,13 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
|
||||
@@ -1173,6 +1173,10 @@ skip_ws_det:
|
||||
* is_on == 0 means MRC CCK is OFF (more noise imm)
|
||||
*/
|
||||
bool is_on = param ? 1 : 0;
|
||||
+
|
||||
+ if (ah->caps.rx_chainmask == 1)
|
||||
+ break;
|
||||
+
|
||||
REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
|
||||
AR_PHY_MRC_CCK_ENABLE, is_on);
|
||||
REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
|
||||
@ -1,82 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
@@ -79,10 +79,6 @@ struct ath_config {
|
||||
sizeof(struct ath_buf_state)); \
|
||||
} while (0)
|
||||
|
||||
-#define ATH_RXBUF_RESET(_bf) do { \
|
||||
- (_bf)->bf_stale = false; \
|
||||
- } while (0)
|
||||
-
|
||||
/**
|
||||
* enum buffer_type - Buffer type flags
|
||||
*
|
||||
@@ -315,6 +311,7 @@ struct ath_rx {
|
||||
struct ath_descdma rxdma;
|
||||
struct ath_rx_edma rx_edma[ATH9K_RX_QUEUE_MAX];
|
||||
|
||||
+ struct ath_buf *buf_hold;
|
||||
struct sk_buff *frag;
|
||||
|
||||
u32 ampdu_ref;
|
||||
--- a/drivers/net/wireless/ath/ath9k/recv.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/recv.c
|
||||
@@ -42,8 +42,6 @@ static void ath_rx_buf_link(struct ath_s
|
||||
struct ath_desc *ds;
|
||||
struct sk_buff *skb;
|
||||
|
||||
- ATH_RXBUF_RESET(bf);
|
||||
-
|
||||
ds = bf->bf_desc;
|
||||
ds->ds_link = 0; /* link to null */
|
||||
ds->ds_data = bf->bf_buf_addr;
|
||||
@@ -70,6 +68,14 @@ static void ath_rx_buf_link(struct ath_s
|
||||
sc->rx.rxlink = &ds->ds_link;
|
||||
}
|
||||
|
||||
+static void ath_rx_buf_relink(struct ath_softc *sc, struct ath_buf *bf)
|
||||
+{
|
||||
+ if (sc->rx.buf_hold)
|
||||
+ ath_rx_buf_link(sc, sc->rx.buf_hold);
|
||||
+
|
||||
+ sc->rx.buf_hold = bf;
|
||||
+}
|
||||
+
|
||||
static void ath_setdefantenna(struct ath_softc *sc, u32 antenna)
|
||||
{
|
||||
/* XXX block beacon interrupts */
|
||||
@@ -117,7 +123,6 @@ static bool ath_rx_edma_buf_link(struct
|
||||
|
||||
skb = bf->bf_mpdu;
|
||||
|
||||
- ATH_RXBUF_RESET(bf);
|
||||
memset(skb->data, 0, ah->caps.rx_status_len);
|
||||
dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
|
||||
ah->caps.rx_status_len, DMA_TO_DEVICE);
|
||||
@@ -432,6 +437,7 @@ int ath_startrecv(struct ath_softc *sc)
|
||||
if (list_empty(&sc->rx.rxbuf))
|
||||
goto start_recv;
|
||||
|
||||
+ sc->rx.buf_hold = NULL;
|
||||
sc->rx.rxlink = NULL;
|
||||
list_for_each_entry_safe(bf, tbf, &sc->rx.rxbuf, list) {
|
||||
ath_rx_buf_link(sc, bf);
|
||||
@@ -677,6 +683,9 @@ static struct ath_buf *ath_get_next_rx_b
|
||||
}
|
||||
|
||||
bf = list_first_entry(&sc->rx.rxbuf, struct ath_buf, list);
|
||||
+ if (bf == sc->rx.buf_hold)
|
||||
+ return NULL;
|
||||
+
|
||||
ds = bf->bf_desc;
|
||||
|
||||
/*
|
||||
@@ -1391,7 +1400,7 @@ requeue:
|
||||
if (edma) {
|
||||
ath_rx_edma_buf_link(sc, qtype);
|
||||
} else {
|
||||
- ath_rx_buf_link(sc, bf);
|
||||
+ ath_rx_buf_relink(sc, bf);
|
||||
ath9k_hw_rxena(ah);
|
||||
}
|
||||
} while (1);
|
||||
Loading…
Reference in new issue