forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: brcm80211: replace broadcom specific auth related defines

Browse source 
- DOT11_OPEN_SYSTEM -> WLAN_AUTH_OPEN
- DOT11_SHARED_KEY -> WLAN_AUTH_SHARED_KEY
- remove unused DOT11_MGMT_HDR_LEN

Signed-off-by: Stanislav Fomichev <kernel@fomichev.me>
Acked-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Stanislav Fomichev 2011-02-27 23:28:19 +03:00 • committed by Greg Kroah-Hartman
commit fd4bd42ead
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file

@ -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_IND:
if (auth_type == DOT11_OPEN_SYSTEM)
if (auth_type == WLAN_AUTH_OPEN)
auth_str = "Open System";
else if (auth_type == DOT11_SHARED_KEY)
else if (auth_type == WLAN_AUTH_SHARED_KEY)
auth_str = "Shared Key";
else {
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
for (i = 0; i < nssid; i++) {
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.wsec = 0;
pfn_element.infra = 1;

5
drivers/staging/brcm80211/include/proto/802.11.h
View file

@ -48,8 +48,6 @@
#define DOT11_BA_BITMAP_LEN 128
#define DOT11_BA_LEN 4
#define DOT11_MGMT_HDR_LEN 24
#define WME_OUI "\x00\x50\xf2"
#define WME_VER 1
#define WME_TYPE 2
@ -114,9 +112,6 @@ typedef struct wme_param_ie wme_param_ie_t;
#define EDCF_AC_VO_TXOP_AP 0x002f
#define DOT11_OPEN_SYSTEM 0
#define DOT11_SHARED_KEY 1
#define SEQNUM_SHIFT 4
#define SEQNUM_MAX 0x1000
#define FRAGNUM_MASK 0xF