Commit 5fc95c40 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman

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

cap_* definitions duplicate WLAN_CAPABILITY_*. Remove cap_* definitions,
improve code consistency.
Reviewed-by: default avatarMike Ximing Chen <mike.ximing.chen@intel.com>
Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20210227222236.581490-5-insafonov@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e93aa384
...@@ -173,11 +173,11 @@ int r8712_generate_ie(struct registry_priv *registrypriv) ...@@ -173,11 +173,11 @@ int r8712_generate_ie(struct registry_priv *registrypriv)
ie += 2; ie += 2;
/*capability info*/ /*capability info*/
*(u16 *)ie = 0; *(u16 *)ie = 0;
*(__le16 *)ie |= cpu_to_le16(cap_IBSS); *(__le16 *)ie |= cpu_to_le16(WLAN_CAPABILITY_IBSS);
if (registrypriv->preamble == PREAMBLE_SHORT) 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) if (dev_network->Privacy)
*(__le16 *)ie |= cpu_to_le16(cap_Privacy); *(__le16 *)ie |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
sz += 2; sz += 2;
ie += 2; ie += 2;
/*SSID*/ /*SSID*/
......
...@@ -278,13 +278,6 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe) ...@@ -278,13 +278,6 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
#define AUTH_ODD_TO 0 #define AUTH_ODD_TO 0
#define AUTH_EVEN_TO 1 #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 * Below is the definition for 802.11i / 802.1x
*------------------------------------------------------------------------------ *------------------------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment