diff options
author | Arend van Spriel <arend@broadcom.com> | 2012-10-12 06:28:14 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-18 03:01:54 -0400 |
commit | 04b2312a683537eec3dbac013920b0e3cfc06123 (patch) | |
tree | 6652aea04871bbbf6beda1e4d42cbb9a15a9019c /drivers/net/wireless/libertas | |
parent | c13a765bd96f4e2f52d218ee6e5c0715380eeeb8 (diff) |
wireless: drivers: 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: Jouni Malinen <j@w1.fi>
Cc: Dan Williams <dcbw@redhat.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Kalle Valo <kvalo@qca.qualcomm.com> [ath6kl]
Acked-by: Bing Zhao <bzhao@marvell.com> [mwifiex]
Acked-by: Stanislav Yakovlev <stas.yakovlev@gmail.com> [ipw2x00]
Signed-off-by: Arend van Spriel <arend@broadcom.com>
[change libipw as well]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r-- | drivers/net/wireless/libertas/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/mesh.c b/drivers/net/wireless/libertas/mesh.c index 97807751ebcf..3e81264db81e 100644 --- a/drivers/net/wireless/libertas/mesh.c +++ b/drivers/net/wireless/libertas/mesh.c | |||
@@ -101,7 +101,7 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action, | |||
101 | 101 | ||
102 | switch (action) { | 102 | switch (action) { |
103 | case CMD_ACT_MESH_CONFIG_START: | 103 | case CMD_ACT_MESH_CONFIG_START: |
104 | ie->id = WLAN_EID_GENERIC; | 104 | ie->id = WLAN_EID_VENDOR_SPECIFIC; |
105 | ie->val.oui[0] = 0x00; | 105 | ie->val.oui[0] = 0x00; |
106 | ie->val.oui[1] = 0x50; | 106 | ie->val.oui[1] = 0x50; |
107 | ie->val.oui[2] = 0x43; | 107 | ie->val.oui[2] = 0x43; |