aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/toshiba
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2012-10-12 06:28:15 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-10-18 03:01:55 -0400
commitc46597f1dea200dfd0b7ace5d1efe816fb41c6ee (patch)
tree3a312a579bf2747b58efa405c312fbe4ba9397ca /drivers/net/ethernet/toshiba
parent04b2312a683537eec3dbac013920b0e3cfc06123 (diff)
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>
Diffstat (limited to 'drivers/net/ethernet/toshiba')
-rw-r--r--drivers/net/ethernet/toshiba/ps3_gelic_wireless.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
index 961c8321451f..72b775fd49c8 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
@@ -452,7 +452,7 @@ static size_t gelic_wl_synthesize_ie(u8 *buf,
452 if (rsn) 452 if (rsn)
453 *buf++ = WLAN_EID_RSN; 453 *buf++ = WLAN_EID_RSN;
454 else 454 else
455 *buf++ = WLAN_EID_GENERIC; 455 *buf++ = WLAN_EID_VENDOR_SPECIFIC;
456 456
457 /* length filed; set later */ 457 /* length filed; set later */
458 buf++; 458 buf++;
@@ -540,7 +540,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
540 break; 540 break;
541 541
542 switch (item_id) { 542 switch (item_id) {
543 case WLAN_EID_GENERIC: 543 case WLAN_EID_VENDOR_SPECIFIC:
544 if ((OUI_LEN + 1 <= item_len) && 544 if ((OUI_LEN + 1 <= item_len) &&
545 !memcmp(pos, wpa_oui, OUI_LEN) && 545 !memcmp(pos, wpa_oui, OUI_LEN) &&
546 pos[OUI_LEN] == 0x01) { 546 pos[OUI_LEN] == 0x01) {