AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

wireless: gelic: make use of WLAN_EID_VENDOR_SPECIFIC

Browse Source 
The include file linux/ieee80211.h contains three definitions for
the same thing in enum ieee80211_eid due to historic changes:

    /* Information Element IDs */
    enum ieee80211_eid {
        :
        WLAN_EID_WPA = 221,
        WLAN_EID_GENERIC = 221,
        WLAN_EID_VENDOR_SPECIFIC = 221,
        :
    };

The standard refers to this as "vendor specific" element so the
other two definitions are better not used. This patch changes the
wireless drivers to use one definition, ie. WLAN_EID_VENDOR_SPECIFIC.

Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Arend van Spriel 2012-10-12 12:28:15 +02:00 committed by Johannes Berg
parent 04b2312a68
commit c46597f1de
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
View File

@ -452,7 +452,7 @@ static size_t gelic_wl_synthesize_ie(u8 *buf,
if (rsn) if (rsn)
*buf++ = WLAN_EID_RSN; *buf++ = WLAN_EID_RSN;
else else
*buf++ = WLAN_EID_GENERIC; *buf++ = WLAN_EID_VENDOR_SPECIFIC;
/* length filed; set later */ /* length filed; set later */
buf++; buf++;
@ -540,7 +540,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
break; break;
switch (item_id) { switch (item_id) {
case WLAN_EID_GENERIC: case WLAN_EID_VENDOR_SPECIFIC:
if ((OUI_LEN + 1 <= item_len) && if ((OUI_LEN + 1 <= item_len) &&
!memcmp(pos, wpa_oui, OUI_LEN) && !memcmp(pos, wpa_oui, OUI_LEN) &&
pos[OUI_LEN] == 0x01) { pos[OUI_LEN] == 0x01) {