summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2012-10-12 12:28:16 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-10-18 09:01:55 +0200
commit3821b4247b40d6b95a59a2895ea6e9bd3f983f04 (patch)
treeee80029888b6825cc432e6e646ed5e738c53c8c5
parentc46597f1dea200dfd0b7ace5d1efe816fb41c6ee (diff)
downloadlinux-stable-3821b4247b40d6b95a59a2895ea6e9bd3f983f04.tar.gz
linux-stable-3821b4247b40d6b95a59a2895ea6e9bd3f983f04.tar.bz2
linux-stable-3821b4247b40d6b95a59a2895ea6e9bd3f983f04.zip
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 <johannes.berg@intel.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--include/linux/ieee80211.h2
1 files changed, 0 insertions, 2 deletions
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,