diff options
| author | Stanislav Fomichev <kernel@fomichev.me> | 2011-02-27 23:28:19 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-28 19:05:24 -0800 |
| commit | fd4bd42ead80c26877e54072a546290dfcb1576c (patch) | |
| tree | 6fa176b7b863d875968e4ebd8ddeb47052e3e168 | |
| parent | 2f7cf8d1ef94a450c5d147cb0c5e1fdf1542a96d (diff) | |
| download | op-kernel-dev-fd4bd42ead80c26877e54072a546290dfcb1576c.zip op-kernel-dev-fd4bd42ead80c26877e54072a546290dfcb1576c.tar.gz | |
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: Stanislav Fomichev <kernel@fomichev.me>
Acked-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 6 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/include/proto/802.11.h | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 784333c..2d4a4b3 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -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; diff --git a/drivers/staging/brcm80211/include/proto/802.11.h b/drivers/staging/brcm80211/include/proto/802.11.h index 8ca674e..141e95f 100644 --- a/drivers/staging/brcm80211/include/proto/802.11.h +++ b/drivers/staging/brcm80211/include/proto/802.11.h @@ -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 |
