From: Arend van Spriel Date: Fri, 12 Oct 2012 10:28:16 +0000 (+0200) Subject: wireless: remove duplicate enum ieee80211_eid definitions X-Git-Tag: MMI-PSA29.97-13-9~15401^2~17^2^2~121 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3821b4247b40d6b95a59a2895ea6e9bd3f983f04;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git wireless: remove duplicate enum ieee80211_eid definitions WLAN_EID_WPA and WLAN_EID_GENERIC mapped to the same value as WLAN_EID_VENDOR_SPECIFIC. The last one being more in line with the standard specification. Removing WLAN_EID_WPA and WLAN_EID_GENERIC as there are no longer drivers using these. Cc: Johannes Berg Signed-off-by: Arend van Spriel Signed-off-by: Johannes Berg --- diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 8c803f0e4925..85764a900731 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1457,8 +1457,6 @@ enum ieee80211_eid { WLAN_EID_RSN = 48, WLAN_EID_MMIE = 76, - WLAN_EID_WPA = 221, - WLAN_EID_GENERIC = 221, WLAN_EID_VENDOR_SPECIFIC = 221, WLAN_EID_QOS_PARAMETER = 222,