3 files changed, 9 insertions, 3 deletions

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index 7056ea31c1d8..63abda3b0ebf 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -766,6 +766,7 @@ static void query_phy_status_page0(struct rtw_dev *rtwdev, u8 *phy_status,
         s8 min_rx_power = -120;
         u8 pwdb = GET_PHY_STAT_P0_PWDB(phy_status);
 
+        /* 8822B uses only 1 antenna to RX CCK rates */
         pkt_stat->rx_power[RF_PATH_A] = pwdb - 110;
         pkt_stat->rssi = rtw_phy_rf_power_2_rssi(pkt_stat->rx_power, 1);
         pkt_stat->bw = RTW_CHANNEL_WIDTH_20;
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index c9a2cbb2620c..c2f6cd76a658 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -1635,9 +1635,9 @@ static void query_phy_status_page0(struct rtw_dev *rtwdev, u8 *phy_status,
         rx_power[RF_PATH_A] -= 110;
         rx_power[RF_PATH_B] -= 110;
 
-        pkt_stat->rx_power[RF_PATH_A] = max3(rx_power[RF_PATH_A],
-                                             rx_power[RF_PATH_B],
-                                             min_rx_power);
+        pkt_stat->rx_power[RF_PATH_A] = rx_power[RF_PATH_A];
+        pkt_stat->rx_power[RF_PATH_B] = rx_power[RF_PATH_B];
+
         pkt_stat->rssi = rtw_phy_rf_power_2_rssi(pkt_stat->rx_power, 1);
         pkt_stat->bw = RTW_CHANNEL_WIDTH_20;
         pkt_stat->signal_power = max(pkt_stat->rx_power[RF_PATH_A],
diff --git a/drivers/net/wireless/realtek/rtw88/rx.c b/drivers/net/wireless/realtek/rtw88/rx.c
index 4d837f0c6d5f..48b9ed49b79a 100644
--- a/drivers/net/wireless/realtek/rtw88/rx.c
+++ b/drivers/net/wireless/realtek/rtw88/rx.c
@@ -90,6 +90,7 @@ void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,
                            u8 *phy_status)
 {
         struct ieee80211_hw *hw = rtwdev->hw;
+        u8 path;
 
         memset(rx_status, 0, sizeof(*rx_status));
         rx_status->freq = hw->conf.chandef.chan->center_freq;
@@ -146,6 +147,10 @@ void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,
                 rx_status->bw = RATE_INFO_BW_20;
 
         rx_status->signal = pkt_stat->signal_power;
+        for (path = 0; path < rtwdev->hal.rf_path_num; path++) {
+                rx_status->chains |= BIT(path);
+                rx_status->chain_signal[path] = pkt_stat->rx_power[path];
+        }
 
         rtw_rx_addr_match(rtwdev, pkt_stat, hdr);
 }