wifi: rtw89: Parse channel from IE to correct invalid hardware reports during scanning
Ping-Ke Shih
maintainerPATCH 1/1 wifi: rtw89: Parse channel from IE to correct invalid hardware reports during scanning
From: Chih-Kang Chang <[email protected]>
For some packets, we could not get channel information from PPDU status. And this causes wrong frequencies being reported. Parse the channel information from IE if provided by AP to fix this.
Signed-off-by Chih-Kang Chang <[email protected]>
Signed-off-by Ping-Ke Shih <[email protected]>
--- drivers/net/wireless/realtek/rtw89/core.c | 44 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + 8 files changed, 51 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +44 -0
@@ -2382,6 +2382,49 @@ static void rtw89_core_validate_rx_signal(struct ieee80211_rx_status *rx_status) rx_status->flag |=RX_FLAG_NO_SIGNAL_VAL ; } +static void rtw89_core_update_rx_freq_from_ie (struct rtw89_dev *rtwdev, +struct sk_buff *skb, +struct ieee80211_rx_status *rx_status) +{ +struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data; +size_t hdr_len, ielen; +u8 *variable; +int chan; + +if (!rtwdev->chip->rx_freq_frome_ie) +return ; + +if (!rtwdev->scanning) +return ; + +if (ieee80211_is_beacon (mgmt->frame_control)) { + variable = mgmt->u.beacon.variable; + hdr_len = offsetof(struct ieee80211_mgmt , + u.beacon.variable); + }else if (ieee80211_is_probe_resp (mgmt->frame_control)) { + variable = mgmt->u.probe_resp.variable; + hdr_len = offsetof(struct ieee80211_mgmt , + u.probe_resp.variable); + }else { +return ; + } + +if (skb->len > hdr_len) + ielen = skb->len - hdr_len; +else +return ; + +/* The parsing code for both 2GHz and 5GHz bands is the same in this +* function. +*/ + chan =cfg80211_get_ies_channel_number (variable, ielen,NL80211_BAND_2GHZ ); +if (chan ==-1 ) +return ; + + rx_status->band = chan >14 ?RTW89_BAND_5G :RTW89_BAND_2G ; + rx_status->freq =ieee80211_channel_to_frequency (chan, rx_status->band); +} + static void rtw89_core_rx_to_mac80211(struct rtw89_dev *rtwdev, struct rtw89_rx_phy_ppdu *phy_ppdu, struct rtw89_rx_desc_info *desc_info,
@@ -2399,6 +2442,7 @@ static void rtw89_core_rx_to_mac80211(struct rtw89_dev *rtwdev,rtw89_core_update_rx_status_by_ppdu (rtwdev, rx_status, phy_ppdu);rtw89_core_update_radiotap (rtwdev, skb_ppdu, rx_status);rtw89_core_validate_rx_signal (rx_status); +rtw89_core_update_rx_freq_from_ie (rtwdev, skb_ppdu, rx_status);/* In low power mode, it does RX in thread context. */ local_bh_disable ();
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4279,6 +4279,7 @@ struct rtw89_chip_info {bool support_ant_gain;bool ul_tb_waveform_ctrl;bool ul_tb_pwr_diff; +bool rx_freq_frome_ie;bool hw_sec_hdr;bool hw_mgmt_tx_encrypt;bool hw_tkip_crypto;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2498,6 +2498,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .support_ant_gain = false, .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, + .rx_freq_frome_ie = true, .hw_sec_hdr = false, .hw_mgmt_tx_encrypt = false, .hw_tkip_crypto = false,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2216,6 +2216,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .support_ant_gain = false, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = false, + .rx_freq_frome_ie = true, .hw_sec_hdr = false, .hw_mgmt_tx_encrypt = false, .hw_tkip_crypto = false,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -852,6 +852,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .support_ant_gain = true, .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, + .rx_freq_frome_ie = true, .hw_sec_hdr = false, .hw_mgmt_tx_encrypt = false, .hw_tkip_crypto = false,
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
@@ -785,6 +785,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .support_ant_gain = true, .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, + .rx_freq_frome_ie = true, .hw_sec_hdr = false, .hw_mgmt_tx_encrypt = false, .hw_tkip_crypto = true,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -3011,6 +3011,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .support_ant_gain = true, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = true, + .rx_freq_frome_ie = false, .hw_sec_hdr = true, .hw_mgmt_tx_encrypt = true, .hw_tkip_crypto = true,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -2770,6 +2770,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .support_ant_gain = false, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = false, + .rx_freq_frome_ie = false, .hw_sec_hdr = true, .hw_mgmt_tx_encrypt = true, .hw_tkip_crypto = true,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerQuoted 8 lines · Ping-Ke Shih
From: Chih-Kang Chang <[email protected]>
For some packets, we could not get channel information from PPDU status. And this causes wrong frequencies being reported. Parse the channel information from IE if provided by AP to fix this.
Signed-off-by Chih-Kang Chang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
1 patch(es) applied to rtw-next branch of rtw.git, thanks.
e16acf907a3c wifi: rtw89: Parse channel from IE to correct invalid hardware reports during scanning