Commit c46597f1 authored Oct 12, 2012 by Arend van Spriel Committed by Johannes Berg Oct 18, 2012

wireless: gelic: make use of WLAN_EID_VENDOR_SPECIFIC



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>

parent 04b2312a

drivers/net/ethernet/toshiba/ps3_gelic_wireless.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -452,7 +452,7 @@ static size_t gelic_wl_synthesize_ie(u8 *buf,
		if (rsn)
		*buf++ = WLAN_EID_RSN;
		else
		*buf++ = WLAN_EID_GENERIC;
		*buf++ = WLAN_EID_VENDOR_SPECIFIC;

		/* length filed; set later */
		buf++;
		@@ -540,7 +540,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
		break;

		switch (item_id) {
		case WLAN_EID_GENERIC:
		case WLAN_EID_VENDOR_SPECIFIC:
		if ((OUI_LEN + 1 <= item_len) &&
		!memcmp(pos, wpa_oui, OUI_LEN) &&
		pos[OUI_LEN] == 0x01) {