diff options
| author | Quytelda Kahja <quytelda@tamalin.org> | 2018-02-28 21:19:10 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-01 17:34:48 +0100 |
| commit | c468d584cd687386c33f730b7c5114501f731e85 (patch) | |
| tree | b80dc6711b412467f0b8cff8267a2ffa217d1b78 | |
| parent | ecad5e1e2012b0986ac398d506379265eb436ba2 (diff) | |
staging: ks7010: Replace local capability constants with kernel constants.
This driver defined constants BSS_CAP_* to represent WLAN capability
codes; however, these constants are already defined in the header
'linux/ieee80211.h' as WLAN_CAPABILITY_*. This change removes the locally
defined constants and substitutes the kernel's constants.
Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
Reviewed-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ks7010/ks_hostif.c | 8 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks_hostif.h | 10 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks_wlan_net.c | 6 |
3 files changed, 7 insertions, 17 deletions
diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 4d11627a3d72..f425975fbcbc 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -1386,14 +1386,14 @@ static __le16 ks_wlan_cap(struct ks_wlan_private *priv) u16 capability = 0x0000; if (priv->reg.preamble == SHORT_PREAMBLE) { - capability |= BSS_CAP_SHORT_PREAMBLE; + capability |= WLAN_CAPABILITY_SHORT_PREAMBLE; } - capability &= ~(BSS_CAP_PBCC); /* pbcc not support */ + capability &= ~(WLAN_CAPABILITY_PBCC); /* pbcc not support */ if (priv->reg.phy_type != D_11B_ONLY_MODE) { - capability |= BSS_CAP_SHORT_SLOT_TIME; - capability &= ~(BSS_CAP_DSSS_OFDM); + capability |= WLAN_CAPABILITY_SHORT_SLOT_TIME; + capability &= ~(WLAN_CAPABILITY_DSSS_OFDM); } return cpu_to_le16((uint16_t)capability); diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h index b46aa94c0d48..8f08e1e58991 100644 --- a/drivers/staging/ks7010/ks_hostif.h +++ b/drivers/staging/ks7010/ks_hostif.h @@ -284,16 +284,6 @@ struct ap_info_t { u8 pad0; /* +09 */ __le16 beacon_period; /* +10 */ __le16 capability; /* +12 */ -#define BSS_CAP_ESS BIT(0) -#define BSS_CAP_IBSS BIT(1) -#define BSS_CAP_CF_POLABLE BIT(2) -#define BSS_CAP_CF_POLL_REQ BIT(3) -#define BSS_CAP_PRIVACY BIT(4) -#define BSS_CAP_SHORT_PREAMBLE BIT(5) -#define BSS_CAP_PBCC BIT(6) -#define BSS_CAP_CHANNEL_AGILITY BIT(7) -#define BSS_CAP_SHORT_SLOT_TIME BIT(10) -#define BSS_CAP_DSSS_OFDM BIT(13) u8 frame_type; /* +14 */ u8 ch_info; /* +15 */ #define FRAME_TYPE_BEACON 0x80 diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index e48c55769c94..91acf87ab8dd 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -1366,8 +1366,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev, /* Add mode */ iwe.cmd = SIOCGIWMODE; capabilities = ap->capability; - if (capabilities & (BSS_CAP_ESS | BSS_CAP_IBSS)) { - if (capabilities & BSS_CAP_ESS) + if (capabilities & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) { + if (capabilities & WLAN_CAPABILITY_ESS) iwe.u.mode = IW_MODE_INFRA; else iwe.u.mode = IW_MODE_ADHOC; @@ -1396,7 +1396,7 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev, /* Add encryption capability */ iwe.cmd = SIOCGIWENCODE; - if (capabilities & BSS_CAP_PRIVACY) + if (capabilities & WLAN_CAPABILITY_PRIVACY) iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY; else iwe.u.data.flags = IW_ENCODE_DISABLED; |