diff options
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9002_mac.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_mac.c | 11 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw-ops.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 5 |
7 files changed, 1 insertions, 37 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c index c338efbccf4..7a332f16b79 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c | |||
@@ -415,15 +415,6 @@ static void ar9002_hw_clr11n_aggr(struct ath_hw *ah, void *ds) | |||
415 | ads->ds_ctl1 &= (~AR_IsAggr & ~AR_MoreAggr); | 415 | ads->ds_ctl1 &= (~AR_IsAggr & ~AR_MoreAggr); |
416 | } | 416 | } |
417 | 417 | ||
418 | static void ar9002_hw_set11n_burstduration(struct ath_hw *ah, void *ds, | ||
419 | u32 burstDuration) | ||
420 | { | ||
421 | struct ar5416_desc *ads = AR5416DESC(ds); | ||
422 | |||
423 | ads->ds_ctl2 &= ~AR_BurstDur; | ||
424 | ads->ds_ctl2 |= SM(burstDuration, AR_BurstDur); | ||
425 | } | ||
426 | |||
427 | void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds, | 418 | void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds, |
428 | u32 size, u32 flags) | 419 | u32 size, u32 flags) |
429 | { | 420 | { |
@@ -456,6 +447,5 @@ void ar9002_hw_attach_mac_ops(struct ath_hw *ah) | |||
456 | ops->set11n_aggr_middle = ar9002_hw_set11n_aggr_middle; | 447 | ops->set11n_aggr_middle = ar9002_hw_set11n_aggr_middle; |
457 | ops->set11n_aggr_last = ar9002_hw_set11n_aggr_last; | 448 | ops->set11n_aggr_last = ar9002_hw_set11n_aggr_last; |
458 | ops->clr11n_aggr = ar9002_hw_clr11n_aggr; | 449 | ops->clr11n_aggr = ar9002_hw_clr11n_aggr; |
459 | ops->set11n_burstduration = ar9002_hw_set11n_burstduration; | ||
460 | ops->set_clrdmask = ar9002_hw_set_clrdmask; | 450 | ops->set_clrdmask = ar9002_hw_set_clrdmask; |
461 | } | 451 | } |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c index c1264d60c49..be6adec33dd 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c | |||
@@ -484,16 +484,6 @@ static void ar9003_hw_clr11n_aggr(struct ath_hw *ah, void *ds) | |||
484 | ads->ctl12 &= (~AR_IsAggr & ~AR_MoreAggr); | 484 | ads->ctl12 &= (~AR_IsAggr & ~AR_MoreAggr); |
485 | } | 485 | } |
486 | 486 | ||
487 | static void ar9003_hw_set11n_burstduration(struct ath_hw *ah, void *ds, | ||
488 | u32 burstDuration) | ||
489 | { | ||
490 | struct ar9003_txc *ads = (struct ar9003_txc *) ds; | ||
491 | |||
492 | ads->ctl13 &= ~AR_BurstDur; | ||
493 | ads->ctl13 |= SM(burstDuration, AR_BurstDur); | ||
494 | |||
495 | } | ||
496 | |||
497 | void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains) | 487 | void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains) |
498 | { | 488 | { |
499 | struct ar9003_txc *ads = ds; | 489 | struct ar9003_txc *ads = ds; |
@@ -518,7 +508,6 @@ void ar9003_hw_attach_mac_ops(struct ath_hw *hw) | |||
518 | ops->set11n_aggr_middle = ar9003_hw_set11n_aggr_middle; | 508 | ops->set11n_aggr_middle = ar9003_hw_set11n_aggr_middle; |
519 | ops->set11n_aggr_last = ar9003_hw_set11n_aggr_last; | 509 | ops->set11n_aggr_last = ar9003_hw_set11n_aggr_last; |
520 | ops->clr11n_aggr = ar9003_hw_clr11n_aggr; | 510 | ops->clr11n_aggr = ar9003_hw_clr11n_aggr; |
521 | ops->set11n_burstduration = ar9003_hw_set11n_burstduration; | ||
522 | ops->set_clrdmask = ar9003_hw_set_clrdmask; | 511 | ops->set_clrdmask = ar9003_hw_set_clrdmask; |
523 | } | 512 | } |
524 | 513 | ||
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 0312aa09180..1bffd156b15 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -62,7 +62,6 @@ struct ath_node; | |||
62 | #define ATH_TXQ_SETUP(sc, i) ((sc)->tx.txqsetup & (1<<i)) | 62 | #define ATH_TXQ_SETUP(sc, i) ((sc)->tx.txqsetup & (1<<i)) |
63 | 63 | ||
64 | struct ath_config { | 64 | struct ath_config { |
65 | u32 ath_aggr_prot; | ||
66 | u16 txpowlimit; | 65 | u16 txpowlimit; |
67 | u8 cabqReadytime; | 66 | u8 cabqReadytime; |
68 | }; | 67 | }; |
diff --git a/drivers/net/wireless/ath/ath9k/hw-ops.h b/drivers/net/wireless/ath/ath9k/hw-ops.h index 9dd90a85ad6..99f8334d1df 100644 --- a/drivers/net/wireless/ath/ath9k/hw-ops.h +++ b/drivers/net/wireless/ath/ath9k/hw-ops.h | |||
@@ -116,12 +116,6 @@ static inline void ath9k_hw_clr11n_aggr(struct ath_hw *ah, void *ds) | |||
116 | ath9k_hw_ops(ah)->clr11n_aggr(ah, ds); | 116 | ath9k_hw_ops(ah)->clr11n_aggr(ah, ds); |
117 | } | 117 | } |
118 | 118 | ||
119 | static inline void ath9k_hw_set11n_burstduration(struct ath_hw *ah, void *ds, | ||
120 | u32 burstDuration) | ||
121 | { | ||
122 | ath9k_hw_ops(ah)->set11n_burstduration(ah, ds, burstDuration); | ||
123 | } | ||
124 | |||
125 | static inline void ath9k_hw_set_clrdmask(struct ath_hw *ah, void *ds, bool val) | 119 | static inline void ath9k_hw_set_clrdmask(struct ath_hw *ah, void *ds, bool val) |
126 | { | 120 | { |
127 | ath9k_hw_ops(ah)->set_clrdmask(ah, ds, val); | 121 | ath9k_hw_ops(ah)->set_clrdmask(ah, ds, val); |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 34ed1bd0e85..b2248bba25a 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -628,8 +628,6 @@ struct ath_hw_ops { | |||
628 | u32 numDelims); | 628 | u32 numDelims); |
629 | void (*set11n_aggr_last)(struct ath_hw *ah, void *ds); | 629 | void (*set11n_aggr_last)(struct ath_hw *ah, void *ds); |
630 | void (*clr11n_aggr)(struct ath_hw *ah, void *ds); | 630 | void (*clr11n_aggr)(struct ath_hw *ah, void *ds); |
631 | void (*set11n_burstduration)(struct ath_hw *ah, void *ds, | ||
632 | u32 burstDuration); | ||
633 | void (*set_clrdmask)(struct ath_hw *ah, void *ds, bool val); | 631 | void (*set_clrdmask)(struct ath_hw *ah, void *ds, bool val); |
634 | }; | 632 | }; |
635 | 633 | ||
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index efdafd28fab..3de115df916 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -2039,9 +2039,6 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, | |||
2039 | if (changed & BSS_CHANGED_BSSID) { | 2039 | if (changed & BSS_CHANGED_BSSID) { |
2040 | ath9k_config_bss(sc, vif); | 2040 | ath9k_config_bss(sc, vif); |
2041 | 2041 | ||
2042 | /* Set aggregation protection mode parameters */ | ||
2043 | sc->config.ath_aggr_prot = 0; | ||
2044 | |||
2045 | ath_dbg(common, ATH_DBG_CONFIG, "BSSID: %pM aid: 0x%x\n", | 2042 | ath_dbg(common, ATH_DBG_CONFIG, "BSSID: %pM aid: 0x%x\n", |
2046 | common->curbssid, common->curaid); | 2043 | common->curbssid, common->curaid); |
2047 | } | 2044 | } |
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 55960fa70dc..947d5b3b6e0 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -1663,8 +1663,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, int len) | |||
1663 | rix = rates[i].idx; | 1663 | rix = rates[i].idx; |
1664 | series[i].Tries = rates[i].count; | 1664 | series[i].Tries = rates[i].count; |
1665 | 1665 | ||
1666 | if ((sc->config.ath_aggr_prot && bf_isaggr(bf)) || | 1666 | if (rates[i].flags & IEEE80211_TX_RC_USE_RTS_CTS) { |
1667 | (rates[i].flags & IEEE80211_TX_RC_USE_RTS_CTS)) { | ||
1668 | series[i].RateFlags |= ATH9K_RATESERIES_RTS_CTS; | 1667 | series[i].RateFlags |= ATH9K_RATESERIES_RTS_CTS; |
1669 | flags |= ATH9K_TXDESC_RTSENA; | 1668 | flags |= ATH9K_TXDESC_RTSENA; |
1670 | } else if (rates[i].flags & IEEE80211_TX_RC_USE_CTS_PROTECT) { | 1669 | } else if (rates[i].flags & IEEE80211_TX_RC_USE_CTS_PROTECT) { |
@@ -1733,8 +1732,6 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, int len) | |||
1733 | !is_pspoll, ctsrate, | 1732 | !is_pspoll, ctsrate, |
1734 | 0, series, 4, flags); | 1733 | 0, series, 4, flags); |
1735 | 1734 | ||
1736 | if (sc->config.ath_aggr_prot && flags) | ||
1737 | ath9k_hw_set11n_burstduration(sc->sc_ah, bf->bf_desc, 8192); | ||
1738 | } | 1735 | } |
1739 | 1736 | ||
1740 | static struct ath_buf *ath_tx_setup_buffer(struct ieee80211_hw *hw, | 1737 | static struct ath_buf *ath_tx_setup_buffer(struct ieee80211_hw *hw, |