staging:rtl8712: replace cap_* definitions with native kernel WLAN_CAPABILITY_*

cap_* definitions duplicate WLAN_CAPABILITY_*. Remove cap_* definitions,
improve code consistency.

Reviewed-by: Mike Ximing Chen <mike.ximing.chen@intel.com>
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20210227222236.581490-5-insafonov@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/ieee80211.c b/drivers/staging/rtl8712/ieee80211.c
index b4a099169c7c8d1ac4cee68533aa2637cc5e649f..13fc3c1ec0db00c47b305e391c91e7567a5faad3 100644 (file)
--- a/drivers/staging/rtl8712/ieee80211.c
+++ b/drivers/staging/rtl8712/ieee80211.c
@@ -173,11 +173,11 @@ int r8712_generate_ie(struct registry_priv *registrypriv)
        ie += 2;
        /*capability info*/
        *(u16 *)ie = 0;
-       *(__le16 *)ie |= cpu_to_le16(cap_IBSS);
+       *(__le16 *)ie |= cpu_to_le16(WLAN_CAPABILITY_IBSS);
        if (registrypriv->preamble == PREAMBLE_SHORT)
-               *(__le16 *)ie |= cpu_to_le16(cap_ShortPremble);
+               *(__le16 *)ie |= cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE);
        if (dev_network->Privacy)
-               *(__le16 *)ie |= cpu_to_le16(cap_Privacy);
+               *(__le16 *)ie |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
        sz += 2;
        ie += 2;
        /*SSID*/

diff --git a/drivers/staging/rtl8712/wifi.h b/drivers/staging/rtl8712/wifi.h
index b7889ac3dce9aa4ddbc29b63c1bd4e00c9957c14..f941efb1f4e26866bab48daad40468d014fa7f37 100644 (file)
--- a/drivers/staging/rtl8712/wifi.h
+++ b/drivers/staging/rtl8712/wifi.h
@@ -278,13 +278,6 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
 #define AUTH_ODD_TO                            0
 #define AUTH_EVEN_TO                   1
 
-#define cap_ESS BIT(0)
-#define cap_IBSS BIT(1)
-#define cap_CFPollable BIT(2)
-#define cap_CFRequest BIT(3)
-#define cap_Privacy BIT(4)
-#define cap_ShortPremble BIT(5)
-
 /*-----------------------------------------------------------------------------
  *                     Below is the definition for 802.11i / 802.1x
  *------------------------------------------------------------------------------