* [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload
@ 2021-04-27 2:20 Ryder Lee
2021-04-27 8:10 ` Felix Fietkau
2021-04-27 8:12 ` Lorenzo Bianconi
0 siblings, 2 replies; 3+ messages in thread
From: Ryder Lee @ 2021-04-27 2:20 UTC (permalink / raw)
To: Felix Fietkau
Cc: Johannes Berg, Lorenzo Bianconi, Shayne Chen, linux-wireless,
linux-mediatek, Ryder Lee
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))
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload
2021-04-27 2:20 [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload Ryder Lee
@ 2021-04-27 8:10 ` Felix Fietkau
2021-04-27 8:12 ` Lorenzo Bianconi
1 sibling, 0 replies; 3+ messages in thread
From: Felix Fietkau @ 2021-04-27 8:10 UTC (permalink / raw)
To: Ryder Lee
Cc: Johannes Berg, Lorenzo Bianconi, Shayne Chen, linux-wireless,
linux-mediatek
On 2021-04-27 04:20, Ryder Lee wrote:
> 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))
The ieee80211_is_data_qos check should still be performed for
non-offloaded packets to avoid triggering on management frames.
- Felix
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload
2021-04-27 2:20 [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload Ryder Lee
2021-04-27 8:10 ` Felix Fietkau
@ 2021-04-27 8:12 ` Lorenzo Bianconi
1 sibling, 0 replies; 3+ messages in thread
From: Lorenzo Bianconi @ 2021-04-27 8:12 UTC (permalink / raw)
To: Ryder Lee
Cc: Felix Fietkau, Johannes Berg, Shayne Chen, linux-wireless,
linux-mediatek
[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]
> 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
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-27 8:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-27 2:20 [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap offload Ryder Lee
2021-04-27 8:10 ` Felix Fietkau
2021-04-27 8:12 ` Lorenzo Bianconi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).