rtl8xxxu: Pass RX rate to rx_parse_phystats and enable phystats for rtl8723bu

rtl8xxxu_rx_parse_phystats() only needs the RX rate to determine
whether to handle the stats as CCK or not. Parsing in the rate rather
than the rx descriptor elimantes the need to handle multiple rx
descriptor formats in the function.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
index 4164b1a3dbd3f8673a273cee973cbbca7cd88c8f..4e08f5e05c6ecaecea2f8527564a487c7e0775c3 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
@@ -7216,13 +7216,13 @@ error:
 
 static void rtl8xxxu_rx_parse_phystats(struct rtl8xxxu_priv *priv,
                                       struct ieee80211_rx_status *rx_status,
-                                      struct rtl8xxxu_rx_desc *rx_desc,
-                                      struct rtl8723au_phy_stats *phy_stats)
+                                      struct rtl8723au_phy_stats *phy_stats,
+                                      u32 rxmcs)
 {
        if (phy_stats->sgi_en)
                rx_status->flag |= RX_FLAG_SHORT_GI;
 
-       if (rx_desc->rxmcs < DESC_RATE_6M) {
+       if (rxmcs < DESC_RATE_6M) {
                /*
                 * Handle PHY stats for CCK rates
                 */
@@ -7350,7 +7350,8 @@ static int rtl8723au_parse_rx_desc(struct rtl8xxxu_priv *priv,
        skb_pull(skb, drvinfo_sz + desc_shift);
 
        if (rx_desc->phy_stats)
-               rtl8xxxu_rx_parse_phystats(priv, rx_status, rx_desc, phy_stats);
+               rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats,
+                                          rx_desc->rxmcs);
 
        rx_status->mactime = le32_to_cpu(rx_desc->tsfl);
        rx_status->flag |= RX_FLAG_MACTIME_START;
@@ -7395,6 +7396,10 @@ static int rtl8723bu_parse_rx_desc(struct rtl8xxxu_priv *priv,
                return RX_TYPE_C2H;
        }
 
+       if (rx_desc->phy_stats)
+               rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats,
+                                          rx_desc->rxmcs);
+
        rx_status->mactime = le32_to_cpu(rx_desc->tsfl);
        rx_status->flag |= RX_FLAG_MACTIME_START;