mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload

Message ID d5303cd9935a9a2f44b76070d191e753895da516.1619489753.git.ryder.lee@mediatek.com
State New
Headers show
Series
  • mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload
Related show

Commit Message

Ryder Lee April 27, 2021, 2:20 a.m.
Avoid checking ieee80211_hdr to support encap offload.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
---
 net/mac80211/rc80211_minstrel_ht.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Lorenzo Bianconi April 27, 2021, 8:12 a.m. | #1
> Avoid checking ieee80211_hdr to support encap offload.
> 
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> ---
>  net/mac80211/rc80211_minstrel_ht.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
> index ecad9b10984f..02a6648aba54 100644
> --- a/net/mac80211/rc80211_minstrel_ht.c
> +++ b/net/mac80211/rc80211_minstrel_ht.c
> @@ -1180,20 +1180,19 @@ minstrel_downgrade_rate(struct minstrel_ht_sta *mi, u16 *idx, bool primary)
>  static void
>  minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb)
>  {
> -	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
>  	struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
>  	u16 tid;
>  
>  	if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
>  		return;
>  
> -	if (unlikely(!ieee80211_is_data_qos(hdr->frame_control)))
> +	if (unlikely(!pubsta->wme))

I guess we are changing the behaviour here since the check is done per-packet
and non per-sta

Regards,
Lorenzo

>  		return;
>  
>  	if (unlikely(skb->protocol == cpu_to_be16(ETH_P_PAE)))
>  		return;
>  
> -	tid = ieee80211_get_tid(hdr);
> +	tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;
>  	if (likely(sta->ampdu_mlme.tid_tx[tid]))
>  		return;
>  
> -- 
> 2.18.0
>

Patch

diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index ecad9b10984f..02a6648aba54 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -1180,20 +1180,19 @@  minstrel_downgrade_rate(struct minstrel_ht_sta *mi, u16 *idx, bool primary)
 static void
 minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb)
 {
-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
 	struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
 	u16 tid;
 
 	if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
 		return;
 
-	if (unlikely(!ieee80211_is_data_qos(hdr->frame_control)))
+	if (unlikely(!pubsta->wme))
 		return;
 
 	if (unlikely(skb->protocol == cpu_to_be16(ETH_P_PAE)))
 		return;
 
-	tid = ieee80211_get_tid(hdr);
+	tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;
 	if (likely(sta->ampdu_mlme.tid_tx[tid]))
 		return;