mac80211: add rate control support for encap offload

The software rate control cannot deal with encap offload, so fix it.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Link: https://lore.kernel.org/r/20210617163113.75815-3-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 9418daa52f68de57ebf0e0fb4513c75a5856632e..e5935e3d7a078ff7e3e87f4a845e959712459b71 100644 (file)
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -870,7 +870,6 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif,
                            int max_rates)
 {
        struct ieee80211_sub_if_data *sdata;
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct ieee80211_supported_band *sband;
 
@@ -882,7 +881,7 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif,
        sdata = vif_to_sdata(vif);
        sband = sdata->local->hw.wiphy->bands[info->band];
 
-       if (ieee80211_is_data(hdr->frame_control))
+       if (ieee80211_is_tx_data(skb))
                rate_control_apply_mask(sdata, sta, sband, dest, max_rates);
 
        if (dest[0].idx < 0)

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b9ff455ee01cc2f80ec87a198b11a4b89bd326a4..ac506245bb940a137cb3cb5afa682c818066d812 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -666,6 +666,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
        u32 len;
        struct ieee80211_tx_rate_control txrc;
        struct ieee80211_sta_rates *ratetbl = NULL;
+       bool encap = info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP;
        bool assoc = false;
 
        memset(&txrc, 0, sizeof(txrc));
@@ -707,7 +708,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
         * just wants a probe response.
         */
        if (tx->sdata->vif.bss_conf.use_short_preamble &&
-           (ieee80211_is_data(hdr->frame_control) ||
+           (ieee80211_is_tx_data(tx->skb) ||
             (tx->sta && test_sta_flag(tx->sta, WLAN_STA_SHORT_PREAMBLE))))
                txrc.short_preamble = true;
 
@@ -729,7 +730,8 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
                 "%s: Dropped data frame as no usable bitrate found while "
                 "scanning and associated. Target station: "
                 "%pM on %d GHz band\n",
-                tx->sdata->name, hdr->addr1,
+                tx->sdata->name,
+                encap ? ((struct ethhdr *)hdr)->h_dest : hdr->addr1,
                 info->band ? 5 : 2))
                return TX_DROP;
 
@@ -763,7 +765,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
 
        if (txrc.reported_rate.idx < 0) {
                txrc.reported_rate = tx->rate;
-               if (tx->sta && ieee80211_is_data(hdr->frame_control))
+               if (tx->sta && ieee80211_is_tx_data(tx->skb))
                        tx->sta->tx_stats.last_rate = txrc.reported_rate;
        } else if (tx->sta)
                tx->sta->tx_stats.last_rate = txrc.reported_rate;
@@ -3673,8 +3675,16 @@ begin:
        else
                info->flags &= ~IEEE80211_TX_CTL_AMPDU;
 
-       if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP)
+       if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) {
+               if (!ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL)) {
+                       r = ieee80211_tx_h_rate_ctrl(&tx);
+                       if (r != TX_CONTINUE) {
+                               ieee80211_free_txskb(&local->hw, skb);
+                               goto begin;
+                       }
+               }
                goto encap_out;
+       }
 
        if (info->control.flags & IEEE80211_TX_CTRL_FAST_XMIT) {
                struct sta_info *sta = container_of(txq->sta, struct sta_info,