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: 1.9.7~12 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=f1d4f179aecece3230d8be54a61a20db456ec86d;hp=f454acd4469fb49286d2930a2b2c1d2d29864276;p=carl9170fw.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 Signed-off-by: Christian Lamparter --- diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 613f0d5..9507127 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1487,8 +1487,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,