Skip to content

Commit a04b920

Browse files
Peter Chiunbd168
authored andcommitted
wifi: mt76: connac: fix checksum offload fields of connac3 RXD
Fix incorrect RXD offset and bitfield related to RX checksum offload. Fixes: 98686cd ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices") Fixes: 4e9011f ("wifi: mt76: connac: move connac3 definitions in mt76_connac3_mac.h") Co-developed-by: Shayne Chen <shayne.chen@mediatek.com> Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com> Link: https://patch.msgid.link/20240816095040.2574-1-shayne.chen@mediatek.com Signed-off-by: Felix Fietkau <nbd@nbd.name>
1 parent f503ae9 commit a04b920

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ enum {
2828
#define MT_RXD0_MESH BIT(18)
2929
#define MT_RXD0_MHCP BIT(19)
3030
#define MT_RXD0_NORMAL_ETH_TYPE_OFS GENMASK(22, 16)
31-
#define MT_RXD0_NORMAL_IP_SUM BIT(23)
32-
#define MT_RXD0_NORMAL_UDP_TCP_SUM BIT(24)
3331

3432
#define MT_RXD0_SW_PKT_TYPE_MASK GENMASK(31, 16)
3533
#define MT_RXD0_SW_PKT_TYPE_MAP 0x380F
@@ -80,6 +78,8 @@ enum {
8078
#define MT_RXD3_NORMAL_BEACON_UC BIT(21)
8179
#define MT_RXD3_NORMAL_CO_ANT BIT(22)
8280
#define MT_RXD3_NORMAL_FCS_ERR BIT(24)
81+
#define MT_RXD3_NORMAL_IP_SUM BIT(26)
82+
#define MT_RXD3_NORMAL_UDP_TCP_SUM BIT(27)
8383
#define MT_RXD3_NORMAL_VLAN2ETH BIT(31)
8484

8585
/* RXD DW4 */

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ mt7925_mac_fill_rx_rate(struct mt792x_dev *dev,
352352
static int
353353
mt7925_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)
354354
{
355-
u32 csum_mask = MT_RXD0_NORMAL_IP_SUM | MT_RXD0_NORMAL_UDP_TCP_SUM;
355+
u32 csum_mask = MT_RXD3_NORMAL_IP_SUM | MT_RXD3_NORMAL_UDP_TCP_SUM;
356356
struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
357357
bool hdr_trans, unicast, insert_ccmp_hdr = false;
358358
u8 chfreq, qos_ctl = 0, remove_pad, amsdu_info;
@@ -362,7 +362,6 @@ mt7925_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)
362362
struct mt792x_phy *phy = &dev->phy;
363363
struct ieee80211_supported_band *sband;
364364
u32 csum_status = *(u32 *)skb->cb;
365-
u32 rxd0 = le32_to_cpu(rxd[0]);
366365
u32 rxd1 = le32_to_cpu(rxd[1]);
367366
u32 rxd2 = le32_to_cpu(rxd[2]);
368367
u32 rxd3 = le32_to_cpu(rxd[3]);
@@ -420,7 +419,7 @@ mt7925_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)
420419
if (!sband->channels)
421420
return -EINVAL;
422421

423-
if (mt76_is_mmio(&dev->mt76) && (rxd0 & csum_mask) == csum_mask &&
422+
if (mt76_is_mmio(&dev->mt76) && (rxd3 & csum_mask) == csum_mask &&
424423
!(csum_status & (BIT(0) | BIT(2) | BIT(3))))
425424
skb->ip_summed = CHECKSUM_UNNECESSARY;
426425

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, enum mt76_rxq_id q,
435435
u32 rxd2 = le32_to_cpu(rxd[2]);
436436
u32 rxd3 = le32_to_cpu(rxd[3]);
437437
u32 rxd4 = le32_to_cpu(rxd[4]);
438-
u32 csum_mask = MT_RXD0_NORMAL_IP_SUM | MT_RXD0_NORMAL_UDP_TCP_SUM;
438+
u32 csum_mask = MT_RXD3_NORMAL_IP_SUM | MT_RXD3_NORMAL_UDP_TCP_SUM;
439439
u32 csum_status = *(u32 *)skb->cb;
440440
u32 mesh_mask = MT_RXD0_MESH | MT_RXD0_MHCP;
441441
bool is_mesh = (rxd0 & mesh_mask) == mesh_mask;
@@ -497,7 +497,7 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, enum mt76_rxq_id q,
497497
if (!sband->channels)
498498
return -EINVAL;
499499

500-
if ((rxd0 & csum_mask) == csum_mask &&
500+
if ((rxd3 & csum_mask) == csum_mask &&
501501
!(csum_status & (BIT(0) | BIT(2) | BIT(3))))
502502
skb->ip_summed = CHECKSUM_UNNECESSARY;
503503

0 commit comments

Comments
 (0)