Skip to content

Commit

Permalink
staging: brcm80211: replace broadcom specific auth related defines
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Stanislav Fomichev authored and Greg Kroah-Hartman committed Mar 1, 2011
1 parent 2f7cf8d commit fd4bd42
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/brcm80211/brcmfmac/dhd_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/brcm80211/include/proto/802.11.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fd4bd42

Please sign in to comment.