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/ipw2x00 | |
| 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/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_rx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c index 02e05792323..95a1ca1e895 100644 --- a/drivers/net/wireless/ipw2x00/libipw_rx.c +++ b/drivers/net/wireless/ipw2x00/libipw_rx.c | |||
| @@ -1108,7 +1108,7 @@ static const char *get_info_element_string(u16 id) | |||
| 1108 | MFIE_STRING(ERP_INFO); | 1108 | MFIE_STRING(ERP_INFO); |
| 1109 | MFIE_STRING(RSN); | 1109 | MFIE_STRING(RSN); |
| 1110 | MFIE_STRING(EXT_SUPP_RATES); | 1110 | MFIE_STRING(EXT_SUPP_RATES); |
| 1111 | MFIE_STRING(GENERIC); | 1111 | MFIE_STRING(VENDOR_SPECIFIC); |
| 1112 | MFIE_STRING(QOS_PARAMETER); | 1112 | MFIE_STRING(QOS_PARAMETER); |
| 1113 | default: | 1113 | default: |
| 1114 | return "UNKNOWN"; | 1114 | return "UNKNOWN"; |
| @@ -1248,8 +1248,8 @@ static int libipw_parse_info_param(struct libipw_info_element | |||
| 1248 | LIBIPW_DEBUG_MGMT("WLAN_EID_CHALLENGE: ignored\n"); | 1248 | LIBIPW_DEBUG_MGMT("WLAN_EID_CHALLENGE: ignored\n"); |
| 1249 | break; | 1249 | break; |
| 1250 | 1250 | ||
| 1251 | case WLAN_EID_GENERIC: | 1251 | case WLAN_EID_VENDOR_SPECIFIC: |
| 1252 | LIBIPW_DEBUG_MGMT("WLAN_EID_GENERIC: %d bytes\n", | 1252 | LIBIPW_DEBUG_MGMT("WLAN_EID_VENDOR_SPECIFIC: %d bytes\n", |
| 1253 | info_element->len); | 1253 | info_element->len); |
| 1254 | if (!libipw_parse_qos_info_param_IE(info_element, | 1254 | if (!libipw_parse_qos_info_param_IE(info_element, |
| 1255 | network)) | 1255 | network)) |
