Message-ID: <4994484d-a053-a870-65e6-6461979ef74f@nbd.name>
Date:   Thu, 2 Dec 2021 09:37:23 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0)
 Gecko/20100101 Thunderbird/91.3.2
Subject: Re: [PATCH] mt76: fix 802.3 RX fail by hdr_trans
Content-Language: en-US
To:     Deren Wu <Deren.Wu@mediatek.com>,
        Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Cc:     Sean Wang <sean.wang@mediatek.com>,
        Soul Huang <Soul.Huang@mediatek.com>,
        YN Chen <YN.Chen@mediatek.com>,
        Leon Yen <Leon.Yen@mediatek.com>,
        Eric-SY Chang <Eric-SY.Chang@mediatek.com>,
        KM Lin <km.lin@mediatek.com>,
        Robin Chiu <robin.chiu@mediatek.com>,
        CH Yeh <ch.yeh@mediatek.com>, Posh Sun <posh.sun@mediatek.com>,
        Eric Liang <Eric.Liang@mediatek.com>,
        Stella Chang <Stella.Chang@mediatek.com>,
        Evelyn Tsai <evelyn.tsai@mediatek.com>,
        Ryder Lee <ryder.lee@mediatek.com>,
        Shayne Chen <shayne.chen@mediatek.com>,
        linux-wireless <linux-wireless@vger.kernel.org>,
        linux-mediatek <linux-mediatek@lists.infradead.org>
References: <0b88b34cc5103e247c134901f9c39614128eb599.1638424783.git.deren.wu@mediatek.com>
From:   Felix Fietkau <nbd@nbd.name>
In-Reply-To: <0b88b34cc5103e247c134901f9c39614128eb599.1638424783.git.deren.wu@mediatek.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 2021-12-02 08:40, Deren Wu wrote:
> From: Deren Wu <deren.wu@mediatek.com>
> 
> Should not run hdr_trans process for 802.3 packets,
> this would cause all data frame RX fail.
> 
> Fixes: d9930ec65b9f ("mt76: only set rx radiotap flag from within decoder functions")
> Reviewed-by: Ryder Lee <ryder.lee@mediatek.com>
> Signed-off-by: Deren Wu <deren.wu@mediatek.com>
> ---
>   drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +-
>   drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 3 +--
>   2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
> index 6c14cb1cfd5a..5757284b24a5 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
> @@ -794,7 +794,7 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
>   		status->flag |= RX_FLAG_8023;
>   	}
>   
> -	if (rxv && mode >= MT_PHY_TYPE_HE_SU)
> +	if (rxv && mode >= MT_PHY_TYPE_HE_SU && !(status->flag & RX_FLAG_8023))
>   		mt7915_mac_decode_he_radiotap(skb, rxv, mode);
>   
>   	if (!status->wcid || !ieee80211_is_data_qos(fc))
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> index e17c8f4c9747..eaffe665cb28 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> @@ -780,7 +780,6 @@ mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb)
>   			mt76_insert_ccmp_hdr(skb, key_id);
>   		}
>   
> -		hdr = mt76_skb_get_hdr(skb);
This line is not safe to remove, since mt76_insert_ccmp_hdr moves the 
header. However, there is a redundant call to mt76_skb_get_hdr above 
this part, which you can remove. Please do that in a separate patch 
though, since it has nothing to do with the rest of the changes.

Thanks,

- Felix