mac80211: call rate_control_send_low() internally

There's no rate control algorithm that *doesn't* want to call
it internally, and calling it internally will let us modify
its behaviour in the future.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/Documentation/driver-api/80211/mac80211-advanced.rst b/Documentation/driver-api/80211/mac80211-advanced.rst
index 70a89b2163c227cc1acf6eaf1d29470363895288..9f1c5bb7ac35827605a9d7ba2da9adee21e84d29 100644 (file)
--- a/Documentation/driver-api/80211/mac80211-advanced.rst
+++ b/Documentation/driver-api/80211/mac80211-advanced.rst
@@ -226,9 +226,6 @@ TBD
 .. kernel-doc:: include/net/mac80211.h
    :functions: ieee80211_tx_rate_control
 
-.. kernel-doc:: include/net/mac80211.h
-   :functions: rate_control_send_low
-
 TBD
 
 This part of the book describes mac80211 internals.

diff --git a/drivers/net/wireless/intel/iwlegacy/3945-rs.c b/drivers/net/wireless/intel/iwlegacy/3945-rs.c
index a697edd46e7fcb41c6c52de33609e1247255aedb..922f09f7ea3e6b90f4d937043157b280d38b2ed7 100644 (file)
--- a/drivers/net/wireless/intel/iwlegacy/3945-rs.c
+++ b/drivers/net/wireless/intel/iwlegacy/3945-rs.c
@@ -646,9 +646,6 @@ il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta,
                il_sta = NULL;
        }
 
-       if (rate_control_send_low(sta, il_sta, txrc))
-               return;
-
        rate_mask = sta->supp_rates[sband->band];
 
        /* get user max rate if set */

diff --git a/drivers/net/wireless/intel/iwlegacy/4965-rs.c b/drivers/net/wireless/intel/iwlegacy/4965-rs.c
index 54ff83829afb11dcc8c56871bac3d1543e3fa33b..946f352fd9a46c02dcb43deb927a002410f040d7 100644 (file)
--- a/drivers/net/wireless/intel/iwlegacy/4965-rs.c
+++ b/drivers/net/wireless/intel/iwlegacy/4965-rs.c
@@ -2224,10 +2224,6 @@ il4965_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta,
                il_sta = NULL;
        }
 
-       /* Send management frames and NO_ACK data using lowest rate. */
-       if (rate_control_send_low(sta, il_sta, txrc))
-               return;
-
        if (!lq_sta)
                return;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c
index ef4b9de256f75b5231ed191fc7afa24394765ba3..838e76a5db68c36c9dc6e566221984507cddf9b4 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c
@@ -2731,10 +2731,6 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,
                priv_sta = NULL;
        }
 
-       /* Send management frames and NO_ACK data using lowest rate. */
-       if (rate_control_send_low(sta, priv_sta, txrc))
-               return;
-
        rate_idx  = lq_sta->last_txrate_idx;
 
        if (lq_sta->last_rate_n_flags & RATE_MCS_HT_MSK) {

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
index c182821ab22b166c51ddbe66fca24d69958f4ec6..9107b1698b0f12f4c52b7adc15efa74d417a12d4 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
@@ -2960,10 +2960,6 @@ static void rs_drv_get_rate(void *mvm_r, struct ieee80211_sta *sta,
                mvm_sta = NULL;
        }
 
-       /* Send management frames and NO_ACK data using lowest rate. */
-       if (rate_control_send_low(sta, mvm_sta, txrc))
-               return;
-
        if (!mvm_sta)
                return;
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rc.c b/drivers/net/wireless/realtek/rtlwifi/rc.c
index cf8e42a01015b96d71b797e453741ca0263a8c2a..0c7d74902d33b7dd361d7ba31924b3809f476e12 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rc.c
@@ -173,9 +173,6 @@ static void rtl_get_rate(void *ppriv, struct ieee80211_sta *sta,
        u8 try_per_rate, i, rix;
        bool not_data = !ieee80211_is_data(fc);
 
-       if (rate_control_send_low(sta, priv_sta, txrc))
-               return;
-
        rix = _rtl_rc_get_highest_rix(rtlpriv, sta, skb, not_data);
        try_per_rate = 1;
        _rtl_rc_rate_set_series(rtlpriv, sta, &rates[0], txrc,

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index ed4911306f030361e71a9f18808a321efeb12e36..4411120e5a9a4edfc0ce9b5ba401c29ebc360101 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -5960,29 +5960,6 @@ static inline int rate_supported(struct ieee80211_sta *sta,
        return (sta == NULL || sta->supp_rates[band] & BIT(index));
 }
 
-/**
- * rate_control_send_low - helper for drivers for management/no-ack frames
- *
- * Rate control algorithms that agree to use the lowest rate to
- * send management frames and NO_ACK data with the respective hw
- * retries should use this in the beginning of their mac80211 get_rate
- * callback. If true is returned the rate control can simply return.
- * If false is returned we guarantee that sta and sta and priv_sta is
- * not null.
- *
- * Rate control algorithms wishing to do more intelligent selection of
- * rate for multicast/broadcast frames may choose to not use this.
- *
- * @sta: &struct ieee80211_sta pointer to the target destination. Note
- *     that this may be null.
- * @priv_sta: private rate control structure. This may be null.
- * @txrc: rate control information we sholud populate for mac80211.
- */
-bool rate_control_send_low(struct ieee80211_sta *sta,
-                          void *priv_sta,
-                          struct ieee80211_tx_rate_control *txrc);
-
-
 static inline s8
 rate_lowest_index(struct ieee80211_supported_band *sband,
                  struct ieee80211_sta *sta)

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 76f303fda3edaf15a98b4d159a6b455e1e8fbfc5..09f89d004a709a5e433f4130a632a7fee13ea61c 100644 (file)
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -369,9 +369,8 @@ static void __rate_control_send_low(struct ieee80211_hw *hw,
 }
 
 
-bool rate_control_send_low(struct ieee80211_sta *pubsta,
-                          void *priv_sta,
-                          struct ieee80211_tx_rate_control *txrc)
+static bool rate_control_send_low(struct ieee80211_sta *pubsta,
+                                 struct ieee80211_tx_rate_control *txrc)
 {
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txrc->skb);
        struct ieee80211_supported_band *sband = txrc->sband;
@@ -379,7 +378,7 @@ bool rate_control_send_low(struct ieee80211_sta *pubsta,
        int mcast_rate;
        bool use_basicrate = false;
 
-       if (!pubsta || !priv_sta || rc_no_data_or_no_ack_use_min(txrc)) {
+       if (!pubsta || rc_no_data_or_no_ack_use_min(txrc)) {
                __rate_control_send_low(txrc->hw, sband, pubsta, info,
                                        txrc->rate_idx_mask);
 
@@ -405,7 +404,6 @@ bool rate_control_send_low(struct ieee80211_sta *pubsta,
        }
        return false;
 }
-EXPORT_SYMBOL(rate_control_send_low);
 
 static bool rate_idx_match_legacy_mask(s8 *rate_idx, int n_bitrates, u32 mask)
 {
@@ -902,12 +900,15 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
        if (ieee80211_hw_check(&sdata->local->hw, HAS_RATE_CONTROL))
                return;
 
+       if (rate_control_send_low(ista, txrc))
+               return;
+
        if (ista) {
                spin_lock_bh(&sta->rate_ctrl_lock);
                ref->ops->get_rate(ref->priv, ista, priv_sta, txrc);
                spin_unlock_bh(&sta->rate_ctrl_lock);
        } else {
-               ref->ops->get_rate(ref->priv, NULL, NULL, txrc);
+               rate_control_send_low(NULL, txrc);
        }
 
        if (ieee80211_hw_check(&sdata->local->hw, SUPPORTS_RC_TABLE))

diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index a34e9c2ca626f31fd740ffc982cde827c62b7d5b..ee86c3333999a187af599c305d7ec86544148619 100644 (file)
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -340,10 +340,6 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta,
        int delta;
        int sampling_ratio;
 
-       /* management/no-ack frames do not use rate control */
-       if (rate_control_send_low(sta, priv_sta, txrc))
-               return;
-
        /* check multi-rate-retry capabilities & adjust lookaround_rate */
        mrr_capable = mp->has_mrr &&
                      !txrc->rts &&

diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index 8b168724c5e7ead9ac04b5efa689e1855b9bc842..da18c6fb6c1d9706f62d8ee0a810ef556c21846f 100644 (file)
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -1098,9 +1098,6 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
        struct minstrel_priv *mp = priv;
        int sample_idx;
 
-       if (rate_control_send_low(sta, priv_sta, txrc))
-               return;
-
        if (!msp->is_ht)
                return mac80211_minstrel.get_rate(priv, sta, &msp->legacy, txrc);