Commit 0649ff58 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtw88: Don't set RX_FLAG_DECRYPTED if packet has no encryption 



The value of GET_RX_DESC_SWDEC() indicates that if this RX
packet requires software decryption or not. And software
decryption is required when the packet was encrypted and the
hardware failed to decrypt it.

So, GET_RX_DESC_SWDEC() is negative does not mean that this
packet is decrypted, it might just have no encryption at all.
To actually see if the packet is decrypted, driver needs to
further check if the hardware has successfully decrypted it,
with a specific type of encryption algorithm.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent c3594559

drivers/net/wireless/realtek/rtw88/rtw8822b.c

+2 −1
Original line number Diff line number Diff line
@@ -836,7 +836,8 @@ static void rtw8822b_query_rx_desc(struct rtw_dev *rtwdev, u8 *rx_desc, 
	pkt_stat->phy_status = GET_RX_DESC_PHYST(rx_desc);

	pkt_stat->icv_err = GET_RX_DESC_ICV_ERR(rx_desc);

	pkt_stat->crc_err = GET_RX_DESC_CRC32(rx_desc);

	pkt_stat->decrypted = !GET_RX_DESC_SWDEC(rx_desc);

	pkt_stat->decrypted = !GET_RX_DESC_SWDEC(rx_desc) &&

			      GET_RX_DESC_ENC_TYPE(rx_desc) != RX_DESC_ENC_NONE;

	pkt_stat->is_c2h = GET_RX_DESC_C2H(rx_desc);

	pkt_stat->pkt_len = GET_RX_DESC_PKT_LEN(rx_desc);

	pkt_stat->drv_info_sz = GET_RX_DESC_DRV_INFO_SIZE(rx_desc);

drivers/net/wireless/realtek/rtw88/rtw8822c.c

+2 −1
Original line number Diff line number Diff line
@@ -1704,7 +1704,8 @@ static void rtw8822c_query_rx_desc(struct rtw_dev *rtwdev, u8 *rx_desc, 
	pkt_stat->phy_status = GET_RX_DESC_PHYST(rx_desc);

	pkt_stat->icv_err = GET_RX_DESC_ICV_ERR(rx_desc);

	pkt_stat->crc_err = GET_RX_DESC_CRC32(rx_desc);

	pkt_stat->decrypted = !GET_RX_DESC_SWDEC(rx_desc);

	pkt_stat->decrypted = !GET_RX_DESC_SWDEC(rx_desc) &&

			      GET_RX_DESC_ENC_TYPE(rx_desc) != RX_DESC_ENC_NONE;

	pkt_stat->is_c2h = GET_RX_DESC_C2H(rx_desc);

	pkt_stat->pkt_len = GET_RX_DESC_PKT_LEN(rx_desc);

	pkt_stat->drv_info_sz = GET_RX_DESC_DRV_INFO_SIZE(rx_desc);

drivers/net/wireless/realtek/rtw88/rx.h

+11 −0
Original line number Diff line number Diff line
@@ -5,6 +5,15 @@ 
#ifndef __RTW_RX_H_

#define __RTW_RX_H_



enum rtw_rx_desc_enc {

	RX_DESC_ENC_NONE	= 0,

	RX_DESC_ENC_WEP40	= 1,

	RX_DESC_ENC_TKIP_WO_MIC	= 2,

	RX_DESC_ENC_TKIP_MIC	= 3,

	RX_DESC_ENC_AES		= 4,

	RX_DESC_ENC_WEP104	= 5,

};



#define GET_RX_DESC_PHYST(rxdesc)                                              \

	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), BIT(26))

#define GET_RX_DESC_ICV_ERR(rxdesc)                                            \
@@ -21,6 +30,8 @@ 
	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), GENMASK(19, 16))

#define GET_RX_DESC_SHIFT(rxdesc)                                              \

	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), GENMASK(25, 24))

#define GET_RX_DESC_ENC_TYPE(rxdesc)                                           \

	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), GENMASK(22, 20))

#define GET_RX_DESC_RX_RATE(rxdesc)                                            \

	le32_get_bits(*((__le32 *)(rxdesc) + 0x03), GENMASK(6, 0))

#define GET_RX_DESC_MACID(rxdesc)                                              \

CRA Git | Maintained and supported by SUSTech CRA and CCSE