staging: rtl8188eu: don't duplicate ieee80211 WLAN_CAPABILITY_* constants

linux/ieee80211.h already defines constants for capability bits.
Include it where needed, resolve discrepancies in naming, and remove the
duplicated definitions.

Also, make use of WLAN_CAPABILITY_IS_STA_BSS() macro to check if neither
ESS nor IBSS capability bits are set.

Signed-off-by: Jakub Sitnicki <jsitnicki@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 581af88..9d484cf 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -1584,7 +1584,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
                }
        }
 
-       if (!(psta->capability & WLAN_CAPABILITY_SHORT_SLOT)) {
+       if (!(psta->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)) {
                if (!psta->no_short_slot_time_set) {
                        psta->no_short_slot_time_set = 1;
 

diff --cc drivers/staging/rtl8188eu/core/rtw_ieee80211.c
Simple merge

diff --cc drivers/staging/rtl8188eu/core/rtw_mlme.c
Simple merge

diff --cc drivers/staging/rtl8188eu/core/rtw_wlan_util.c
Simple merge

diff --cc drivers/staging/rtl8188eu/include/ieee80211.h
Simple merge

diff --cc drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
Simple merge