2021-04-27 02:23:00

by Ryder Lee

[permalink] [raw]

Subject: [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload

---

Avoid checking ieee80211_hdr to support encap offload.

Signed-off-by: Ryder Lee <[email protected]>
---
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))
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

2021-04-27 08:13:35

by Lorenzo Bianconi

[permalink] [raw]

Subject: Re: [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload

---

> Avoid checking ieee80211_hdr to support encap offload.
>
> Signed-off-by: Ryder Lee <[email protected]>
> ---
> 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
>

---

Attachments:

(No filename) (1.34 kB)
signature.asc (235.00 B)
Download all attachments

2021-04-27 08:15:31

by Felix Fietkau

[permalink] [raw]

Subject: Re: [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload

---

On 2021-04-27 04:20, Ryder Lee wrote:
> Avoid checking ieee80211_hdr to support encap offload.
>
> Signed-off-by: Ryder Lee <[email protected]>
> ---
> 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))
The ieee80211_is_data_qos check should still be performed for
non-offloaded packets to avoid triggering on management frames.

- Felix