|
|
@@ -2235,7 +2235,18 @@
|
|
|
#define REALTEK_USB_VENQT_WRITE 0x40
|
|
|
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
|
|
-@@ -137,7 +137,8 @@ int ath_descdma_setup(struct ath_softc *
|
|
|
+@@ -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
|
|
|
+ *
|
|
|
+@@ -137,7 +133,8 @@ int ath_descdma_setup(struct ath_softc *
|
|
|
#define ATH_AGGR_ENCRYPTDELIM 10
|
|
|
/* minimum h/w qdepth to be sustained to maximize aggregation */
|
|
|
#define ATH_AGGR_MIN_QDEPTH 2
|
|
|
@@ -2245,7 +2256,7 @@
|
|
|
|
|
|
#define IEEE80211_SEQ_SEQ_SHIFT 4
|
|
|
#define IEEE80211_SEQ_MAX 4096
|
|
|
-@@ -174,12 +175,6 @@ int ath_descdma_setup(struct ath_softc *
|
|
|
+@@ -174,12 +171,6 @@ int ath_descdma_setup(struct ath_softc *
|
|
|
|
|
|
#define ATH_TX_COMPLETE_POLL_INT 1000
|
|
|
|
|
|
@@ -2258,7 +2269,7 @@
|
|
|
#define ATH_TXFIFO_DEPTH 8
|
|
|
struct ath_txq {
|
|
|
int mac80211_qnum; /* mac80211 queue number, -1 means not mac80211 Q */
|
|
|
-@@ -212,8 +207,9 @@ struct ath_frame_info {
|
|
|
+@@ -212,8 +203,9 @@ struct ath_frame_info {
|
|
|
int framelen;
|
|
|
enum ath9k_key_type keytype;
|
|
|
u8 keyix;
|
|
|
@@ -2269,7 +2280,7 @@
|
|
|
};
|
|
|
|
|
|
struct ath_buf_state {
|
|
|
-@@ -241,6 +237,7 @@ struct ath_buf {
|
|
|
+@@ -241,6 +233,7 @@ struct ath_buf {
|
|
|
struct ath_atx_tid {
|
|
|
struct list_head list;
|
|
|
struct sk_buff_head buf_q;
|
|
|
@@ -2277,7 +2288,7 @@
|
|
|
struct ath_node *an;
|
|
|
struct ath_atx_ac *ac;
|
|
|
unsigned long tx_buf[BITS_TO_LONGS(ATH_TID_MAX_BUFS)];
|
|
|
-@@ -268,6 +265,7 @@ struct ath_node {
|
|
|
+@@ -268,6 +261,7 @@ struct ath_node {
|
|
|
u8 mpdudensity;
|
|
|
|
|
|
bool sleeping;
|
|
|
@@ -2285,7 +2296,15 @@
|
|
|
|
|
|
#if defined(CPTCFG_MAC80211_DEBUGFS) && defined(CPTCFG_ATH9K_DEBUGFS)
|
|
|
struct dentry *node_stat;
|
|
|
-@@ -367,6 +365,7 @@ void ath9k_release_buffered_frames(struc
|
|
|
+@@ -317,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;
|
|
|
+@@ -367,6 +362,7 @@ void ath9k_release_buffered_frames(struc
|
|
|
/********/
|
|
|
|
|
|
struct ath_vif {
|
|
|
@@ -2374,3 +2393,77 @@
|
|
|
ibss_dbg(sdata, "sta_find_ibss: did not try to join ibss\n");
|
|
|
|
|
|
/* Selected IBSS not found in current scan results - try to scan */
|
|
|
+--- 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,
|
|
|
+--- 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;
|
|
|
+
|
|
|
+ /*
|
|
|
+@@ -1375,7 +1384,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);
|
Felix Fietkau