use common ieee80211 constants

Many defined constants in wifi.h are unused and/or available from
<linux/ieee80211.h>, some with slightly different names. Remove
the constants from ieee80211.h and wifi.h and use the common ones. Rename where
necessary.
This commit is contained in:
Carlos Garces
2021-10-12 17:52:52 +02:00
parent cc69f83f3d
commit 91b4661c5f
7 changed files with 17 additions and 202 deletions

View File

@@ -318,9 +318,9 @@ static inline char *iwe_stream_mode_process(_adapter *padapter,
char *start, char *stop, struct iw_event *iwe, u16 cap)
{
/* Add mode */
if (cap & (WLAN_CAPABILITY_IBSS | WLAN_CAPABILITY_BSS)) {
if (cap & (WLAN_CAPABILITY_IBSS | WLAN_CAPABILITY_ESS)) {
iwe->cmd = SIOCGIWMODE;
if (cap & WLAN_CAPABILITY_BSS)
if (cap & WLAN_CAPABILITY_ESS)
iwe->u.mode = IW_MODE_MASTER;
else
iwe->u.mode = IW_MODE_ADHOC;
@@ -7396,7 +7396,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param)
psta = rtw_get_stainfo(pstapriv, param->sta_addr);
if (psta) {
if ((psta->wpa_ie[0] == WLAN_EID_RSN) || (psta->wpa_ie[0] == WLAN_EID_GENERIC)) {
if ((psta->wpa_ie[0] == WLAN_EID_RSN) || (psta->wpa_ie[0] == WLAN_EID_VENDOR_SPECIFIC)) {
int wpa_ie_len;
int copy_len;