[PATCH] mt76: mt7915: disable RX_HDR_TRANS_SHORT

[bo.jiao]

hi felix:

mt7915_mac_fill_rx:
	......

	if (!status->wcid || !ieee80211_is_data_qos(fc))
		return 0;

	status->aggr = unicast &&
		       !ieee80211_is_qos_nullfunc(fc);
	status->qos_ctl = qos_ctl;
	status->seqno = IEEE80211_SEQ_TO_SN(seq_ctrl);

	return 0;

it will be returned by the condition !ieee80211_is_data_qos(fc) when
receive non-Qos (null) data, and the status->aggr/status-
>qos_ctl/status->seqno keep the default value 0.

mt76_rx_aggr_reorder:
	....

	sta = wcid_to_sta(wcid);
	if (!sta)
		return;

	if (!status->aggr && !(status->flag & RX_FLAG_8023)) {
		mt76_rx_aggr_check_ctl(skb, frames);
		return;
	}

	....

those packet will be forced to do rx reorder and may incorrectly update
tid->head.
https://patchwork.kernel.org/project/linux-wireless/patch/2022042010503
8.36443-1-nbd at nbd.name/
Your replacement patch did not include this change.
+	if (!status->aggr)
+		return;
+

Thanks.


On Wed, 2022-04-20 at 13:25 +0200, Felix Fietkau wrote:
> On 20.04.22 09:11, Bo Jiao wrote:
> > From: Bo Jiao <Bo.Jiao at mediatek.com>
> > 
> > This patch disables RX_TRANS_SHORT to make MDP to do header
> > translation
> > when payload less than 8 bytes, hence the (QoS) null data can be
> > encapsulated
> > to 802.3 format. However, WDS requires (QoS) null data in 802.11
> > format
> > to created vlan AP interfaces.
> > 
> > Signed-off-by: Ryder Lee <ryder.lee at mediatek.com>
> > Signed-off-by: lian.chen <lian.chen at mediatek.com>
> > Signed-off-by: Sujuan Chen <sujuan.chen at mediatek.com>
> > Signed-off-by: Bo Jiao <Bo.Jiao at mediatek.com>
> > ---
> >   drivers/net/wireless/mediatek/mt76/agg-rx.c      | 3 +++
> >   drivers/net/wireless/mediatek/mt76/mt7915/init.c | 3 +++
> >   drivers/net/wireless/mediatek/mt76/mt7915/mac.c  | 4 ----
> >   drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 3 +++
> >   4 files changed, 9 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c
> > b/drivers/net/wireless/mediatek/mt76/agg-rx.c
> > index 7262222..efd1a85 100644
> > --- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
> > +++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
> > @@ -167,6 +167,9 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb,
> > struct sk_buff_head *frames)
> >   		return;
> >   	}
> >   
> > +	if (!status->aggr)
> > +		return;
> > +
> >   	/* not part of a BA session */
> >   	ackp = status->qos_ctl &
> > IEEE80211_QOS_CTL_ACK_POLICY_MASK;
> >   	if (ackp != IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK &&
> 
> This is an unrelated change, for which I've just sent a replacement 
> patch. The rest is applied.
> 
> Thanks,
> 
> - Felix