Commit fd4bd42e authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Greg Kroah-Hartman

staging: brcm80211: replace broadcom specific auth related defines

- DOT11_OPEN_SYSTEM -> WLAN_AUTH_OPEN
- DOT11_SHARED_KEY -> WLAN_AUTH_SHARED_KEY
- remove unused DOT11_MGMT_HDR_LEN
Signed-off-by: default avatarStanislav Fomichev <kernel@fomichev.me>
Acked-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2f7cf8d1
...@@ -632,9 +632,9 @@ static void wl_show_host_event(wl_event_msg_t *event, void *event_data) ...@@ -632,9 +632,9 @@ static void wl_show_host_event(wl_event_msg_t *event, void *event_data)
case WLC_E_AUTH: case WLC_E_AUTH:
case WLC_E_AUTH_IND: case WLC_E_AUTH_IND:
if (auth_type == DOT11_OPEN_SYSTEM) if (auth_type == WLAN_AUTH_OPEN)
auth_str = "Open System"; auth_str = "Open System";
else if (auth_type == DOT11_SHARED_KEY) else if (auth_type == WLAN_AUTH_SHARED_KEY)
auth_str = "Shared Key"; auth_str = "Shared Key";
else { else {
sprintf(err_msg, "AUTH unknown: %d", (int)auth_type); sprintf(err_msg, "AUTH unknown: %d", (int)auth_type);
...@@ -1807,7 +1807,7 @@ dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t *ssids_local, int nssid, unsigned char sc ...@@ -1807,7 +1807,7 @@ dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t *ssids_local, int nssid, unsigned char sc
for (i = 0; i < nssid; i++) { for (i = 0; i < nssid; i++) {
pfn_element.bss_type = DOT11_BSSTYPE_INFRASTRUCTURE; pfn_element.bss_type = DOT11_BSSTYPE_INFRASTRUCTURE;
pfn_element.auth = DOT11_OPEN_SYSTEM; pfn_element.auth = WLAN_AUTH_OPEN;
pfn_element.wpa_auth = WPA_AUTH_PFN_ANY; pfn_element.wpa_auth = WPA_AUTH_PFN_ANY;
pfn_element.wsec = 0; pfn_element.wsec = 0;
pfn_element.infra = 1; pfn_element.infra = 1;
......
...@@ -48,8 +48,6 @@ ...@@ -48,8 +48,6 @@
#define DOT11_BA_BITMAP_LEN 128 #define DOT11_BA_BITMAP_LEN 128
#define DOT11_BA_LEN 4 #define DOT11_BA_LEN 4
#define DOT11_MGMT_HDR_LEN 24
#define WME_OUI "\x00\x50\xf2" #define WME_OUI "\x00\x50\xf2"
#define WME_VER 1 #define WME_VER 1
#define WME_TYPE 2 #define WME_TYPE 2
...@@ -114,9 +112,6 @@ typedef struct wme_param_ie wme_param_ie_t; ...@@ -114,9 +112,6 @@ typedef struct wme_param_ie wme_param_ie_t;
#define EDCF_AC_VO_TXOP_AP 0x002f #define EDCF_AC_VO_TXOP_AP 0x002f
#define DOT11_OPEN_SYSTEM 0
#define DOT11_SHARED_KEY 1
#define SEQNUM_SHIFT 4 #define SEQNUM_SHIFT 4
#define SEQNUM_MAX 0x1000 #define SEQNUM_MAX 0x1000
#define FRAGNUM_MASK 0xF #define FRAGNUM_MASK 0xF
......
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