Commit 82e1dd0f authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76: use mt76_rx_status in mt76x0 



Make rx status processing similar to mt76x2.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 7c1f8881

drivers/net/wireless/mediatek/mt76/mac80211.c

+2 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid, 
}

EXPORT_SYMBOL(mt76_wcid_key_setup);



static struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb)

struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb)

{

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);

	struct mt76_rx_status mstat;
@@ -500,6 +500,7 @@ static struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb) 


	return wcid_to_sta(mstat.wcid);

}

EXPORT_SYMBOL(mt76_rx_convert);



static int

mt76_check_ccmp_pn(struct sk_buff *skb)

drivers/net/wireless/mediatek/mt76/mt76.h

+2 −0
Original line number Diff line number Diff line
@@ -573,6 +573,8 @@ void mt76_rx_aggr_stop(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tid); 
void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid,

			 struct ieee80211_key_conf *key);



struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb);



/* internal */

void mt76_tx_free(struct mt76_dev *dev);

struct mt76_txwi_cache *mt76_get_txwi(struct mt76_dev *dev);

drivers/net/wireless/mediatek/mt76/mt76x0/dma.c

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ static void mt76x0_rx_process_seg(struct mt76x0_dev *dev, u8 *data, 
	if (!skb)

		return;



	mt76_rx_convert(skb);



	spin_lock(&dev->mac_lock);

	ieee80211_rx(dev->mt76.hw, skb);

	spin_unlock(&dev->mac_lock);

drivers/net/wireless/mediatek/mt76/mt76x0/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void mt76x0_mac_set_ampdu_factor(struct mt76x0_dev *dev) 
}



static void

mt76_mac_process_rate(struct ieee80211_rx_status *status, u16 rate)

mt76_mac_process_rate(struct mt76_rx_status *status, u16 rate)

{

	u8 idx = FIELD_GET(MT_RXWI_RATE_INDEX, rate);
@@ -282,7 +282,7 @@ mt76x0_rx_is_our_beacon(struct mt76x0_dev *dev, u8 *data) 
u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb,

			u8 *data, void *rxi)

{

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);

	struct mt76_rx_status *status = (struct mt76_rx_status *) skb->cb;

	struct mt76x02_rxwi *rxwi = rxi;

	u32 len, ctl = le32_to_cpu(rxwi->ctl);

	u16 rate = le16_to_cpu(rxwi->rate);

CRA Git | Maintained and supported by SUSTech CRA and CCSE