1 files changed, 10 insertions, 12 deletions

diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 01f56c7df8b5..0517a4f2d3f2 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -394,20 +394,18 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
                 }
         }
         /* <5> set hw caps */
-        hw->flags = IEEE80211_HW_SIGNAL_DBM |
-            IEEE80211_HW_RX_INCLUDES_FCS |
-            IEEE80211_HW_AMPDU_AGGREGATION |
-            IEEE80211_HW_CONNECTION_MONITOR |
-            /* IEEE80211_HW_SUPPORTS_CQM_RSSI | */
-            IEEE80211_HW_MFP_CAPABLE |
-            IEEE80211_HW_REPORTS_TX_ACK_STATUS | 0;
+        ieee80211_hw_set(hw, SIGNAL_DBM);
+        ieee80211_hw_set(hw, RX_INCLUDES_FCS);
+        ieee80211_hw_set(hw, AMPDU_AGGREGATION);
+        ieee80211_hw_set(hw, CONNECTION_MONITOR);
+        ieee80211_hw_set(hw, MFP_CAPABLE);
+        ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);
 
         /* swlps or hwlps has been set in diff chip in init_sw_vars */
-        if (rtlpriv->psc.swctrl_lps)
-                hw->flags |= IEEE80211_HW_SUPPORTS_PS |
-                        IEEE80211_HW_PS_NULLFUNC_STACK |
-                        /* IEEE80211_HW_SUPPORTS_DYNAMIC_PS | */
-                        0;
+        if (rtlpriv->psc.swctrl_lps) {
+                ieee80211_hw_set(hw, SUPPORTS_PS);
+                ieee80211_hw_set(hw, PS_NULLFUNC_STACK);
+        }
         hw->wiphy->interface_modes =
             BIT(NL80211_IFTYPE_AP) |
             BIT(NL80211_IFTYPE_STATION) |