diff options
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/rc.c | 16 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 14 |
3 files changed, 16 insertions, 15 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 004533d2ca5f..9f8e542ef47e 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
| @@ -345,7 +345,6 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
| 345 | void ath_tx_tasklet(struct ath_softc *sc); | 345 | void ath_tx_tasklet(struct ath_softc *sc); |
| 346 | void ath_tx_edma_tasklet(struct ath_softc *sc); | 346 | void ath_tx_edma_tasklet(struct ath_softc *sc); |
| 347 | void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb); | 347 | void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb); |
| 348 | bool ath_tx_aggr_check(struct ath_softc *sc, struct ath_node *an, u8 tidno); | ||
| 349 | int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, | 348 | int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, |
| 350 | u16 tid, u16 *ssn); | 349 | u16 tid, u16 *ssn); |
| 351 | void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid); | 350 | void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid); |
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index e49be733d546..ce1cd6d85847 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c | |||
| @@ -1320,6 +1320,22 @@ static u8 ath_rc_build_ht_caps(struct ath_softc *sc, struct ieee80211_sta *sta, | |||
| 1320 | return caps; | 1320 | return caps; |
| 1321 | } | 1321 | } |
| 1322 | 1322 | ||
| 1323 | static bool ath_tx_aggr_check(struct ath_softc *sc, struct ath_node *an, | ||
| 1324 | u8 tidno) | ||
| 1325 | { | ||
| 1326 | struct ath_atx_tid *txtid; | ||
| 1327 | |||
| 1328 | if (!(sc->sc_flags & SC_OP_TXAGGR)) | ||
| 1329 | return false; | ||
| 1330 | |||
| 1331 | txtid = ATH_AN_2_TID(an, tidno); | ||
| 1332 | |||
| 1333 | if (!(txtid->state & (AGGR_ADDBA_COMPLETE | AGGR_ADDBA_PROGRESS))) | ||
| 1334 | return true; | ||
| 1335 | return false; | ||
| 1336 | } | ||
| 1337 | |||
| 1338 | |||
| 1323 | /***********************************/ | 1339 | /***********************************/ |
| 1324 | /* mac80211 Rate Control callbacks */ | 1340 | /* mac80211 Rate Control callbacks */ |
| 1325 | /***********************************/ | 1341 | /***********************************/ |
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index e53433e3e4cc..85a7323a04ef 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
| @@ -855,20 +855,6 @@ void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid | |||
| 855 | } | 855 | } |
| 856 | } | 856 | } |
| 857 | 857 | ||
| 858 | bool ath_tx_aggr_check(struct ath_softc *sc, struct ath_node *an, u8 tidno) | ||
| 859 | { | ||
| 860 | struct ath_atx_tid *txtid; | ||
| 861 | |||
| 862 | if (!(sc->sc_flags & SC_OP_TXAGGR)) | ||
| 863 | return false; | ||
| 864 | |||
| 865 | txtid = ATH_AN_2_TID(an, tidno); | ||
| 866 | |||
| 867 | if (!(txtid->state & (AGGR_ADDBA_COMPLETE | AGGR_ADDBA_PROGRESS))) | ||
| 868 | return true; | ||
| 869 | return false; | ||
| 870 | } | ||
| 871 | |||
| 872 | /********************/ | 858 | /********************/ |
| 873 | /* Queue Management */ | 859 | /* Queue Management */ |
| 874 | /********************/ | 860 | /********************/ |
