ath9k: Calculate ampdu limit using a helper

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index acf53728894696a1e518ae7adcb5bd1aaadc2486..23145ce9ea3ff67f1aebe1ac99661eff5e55df95 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -461,6 +461,7 @@ void ath9k_stop_btcoex(struct ath_softc *sc);
 void ath9k_btcoex_timer_resume(struct ath_softc *sc);
 void ath9k_btcoex_timer_pause(struct ath_softc *sc);
 void ath9k_btcoex_handle_interrupt(struct ath_softc *sc, u32 status);
+u16 ath9k_btcoex_aggr_limit(struct ath_softc *sc, u32 max_4ms_framelen);
 
 /********************/
 /*   LED Control    */

diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index a24aa679c69999fcc3b124a1d79e6d3d04fa9f1c..e870251cdd1be46855c52c07e4fce0430495818e 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -318,6 +318,20 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc)
        btcoex->hw_timer_enabled = false;
 }
 
+u16 ath9k_btcoex_aggr_limit(struct ath_softc *sc, u32 max_4ms_framelen)
+{
+       struct ath_mci_profile *mci = &sc->btcoex.mci;
+       u16 aggr_limit = 0;
+
+       if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI) && mci->aggr_limit)
+               aggr_limit = (max_4ms_framelen * mci->aggr_limit) >> 4;
+       else if (sc->sc_flags & SC_OP_BT_PRIORITY_DETECTED)
+               aggr_limit = min((max_4ms_framelen * 3) / 8,
+                                (u32)ATH_AMPDU_LIMIT_MAX);
+
+       return aggr_limit;
+}
+
 void ath9k_btcoex_handle_interrupt(struct ath_softc *sc, u32 status)
 {
        struct ath_hw *ah = sc->sc_ah;

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 3182408ffe35abcc08c075d8f950cf433d1ca9cf..5dd27d2712fcceaf192e09f7e6a0417872e5cf08 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -647,9 +647,8 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
        struct sk_buff *skb;
        struct ieee80211_tx_info *tx_info;
        struct ieee80211_tx_rate *rates;
-       struct ath_mci_profile *mci = &sc->btcoex.mci;
        u32 max_4ms_framelen, frmlen;
-       u16 aggr_limit, legacy = 0;
+       u16 aggr_limit, bt_aggr_limit, legacy = 0;
        int i;
 
        skb = bf->bf_mpdu;
@@ -694,14 +693,14 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
        if (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE || legacy)
                return 0;
 
-       if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI) && mci->aggr_limit)
-               aggr_limit = (max_4ms_framelen * mci->aggr_limit) >> 4;
-       else if (sc->sc_flags & SC_OP_BT_PRIORITY_DETECTED)
-               aggr_limit = min((max_4ms_framelen * 3) / 8,
-                                (u32)ATH_AMPDU_LIMIT_MAX);
-       else
-               aggr_limit = min(max_4ms_framelen,
-                                (u32)ATH_AMPDU_LIMIT_MAX);
+       aggr_limit = min(max_4ms_framelen, (u32)ATH_AMPDU_LIMIT_MAX);
+
+       /*
+        * Override the default aggregation limit for BTCOEX.
+        */
+       bt_aggr_limit = ath9k_btcoex_aggr_limit(sc, max_4ms_framelen);
+       if (bt_aggr_limit)
+               aggr_limit = bt_aggr_limit;
 
        /*
         * h/w can accept aggregates up to 16 bit lengths (65535).