Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 27 Apr 2021 10:12:43 +0200
From:   Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
To:     Ryder Lee <ryder.lee@mediatek.com>
Cc:     Felix Fietkau <nbd@nbd.name>,
        Johannes Berg <johannes.berg@intel.com>,
        Shayne Chen <shayne.chen@mediatek.com>,
        linux-wireless@vger.kernel.org, linux-mediatek@lists.infradead.org
Subject: Re: [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap
 offload
Message-ID: <YIfHe6d5IskhogTX@lore-desk>
References: <d5303cd9935a9a2f44b76070d191e753895da516.1619489753.git.ryder.lee@mediatek.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="83y9azwuOsjwp1b/"
Content-Disposition: inline
In-Reply-To: <d5303cd9935a9a2f44b76070d191e753895da516.1619489753.git.ryder.lee@mediatek.com>
Precedence: bulk


--83y9azwuOsjwp1b/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

> Avoid checking ieee80211_hdr to support encap offload.
>=20
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> ---
>  net/mac80211/rc80211_minstrel_ht.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>=20
> diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_mi=
nstrel_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 *m=
i, u16 *idx, bool primary)
>  static void
>  minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb)
>  {
> -	struct ieee80211_hdr *hdr =3D (struct ieee80211_hdr *) skb->data;
>  	struct sta_info *sta =3D container_of(pubsta, struct sta_info, sta);
>  	u16 tid;
> =20
>  	if (skb_get_queue_mapping(skb) =3D=3D IEEE80211_AC_VO)
>  		return;
> =20
> -	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-pack=
et
and non per-sta

Regards,
Lorenzo

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

--83y9azwuOsjwp1b/
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYIAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCYIfHeAAKCRA6cBh0uS2t
rJ40AP9s6SLk4IcjrZzQrwyK7qXNgfz7YsCNihD0/e/z6jszdgD8CnpJET02ahT0
lLNlUKno+70LFeDa4y8N6vJVnne3YQ4=
=So7w
-----END PGP SIGNATURE-----

--83y9azwuOsjwp1b/--