summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-08-28 15:31:48 +0300
committerJohannes Berg <johannes.berg@intel.com>2015-09-22 16:21:27 +0300
commit0edd5faeb07bfd3ec5402f9467e4c169dcd131e8 (patch)
tree842e37957d7b86396df61fd3c06370819784ed81
parent338c17ae311e6b5a439573a4043fd2d9237cd1d5 (diff)
downloadlinux-0edd5faeb07bfd3ec5402f9467e4c169dcd131e8.tar.xz
wireless: mark element IDs 8 and 9 reserved
These were never used in the tree, and are marked as reserved in the IEEE 802.11 documentation (ANA). Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/ipw2x00/libipw_rx.c2
-rw-r--r--include/linux/ieee80211.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
index a6877dd6ba73..cef7f7d79cd9 100644
--- a/drivers/net/wireless/ipw2x00/libipw_rx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
@@ -1091,8 +1091,6 @@ static const char *get_info_element_string(u16 id)
MFIE_STRING(TIM);
MFIE_STRING(IBSS_PARAMS);
MFIE_STRING(COUNTRY);
- MFIE_STRING(HP_PARAMS);
- MFIE_STRING(HP_TABLE);
MFIE_STRING(REQUEST);
MFIE_STRING(CHALLENGE);
MFIE_STRING(PWR_CONSTRAINT);
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 19eb9ecd6cf3..f79a02a69d26 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1746,8 +1746,7 @@ enum ieee80211_eid {
WLAN_EID_TIM = 5,
WLAN_EID_IBSS_PARAMS = 6,
WLAN_EID_COUNTRY = 7,
- WLAN_EID_HP_PARAMS = 8,
- WLAN_EID_HP_TABLE = 9,
+ /* 8, 9 reserved */
WLAN_EID_REQUEST = 10,
WLAN_EID_QBSS_LOAD = 11,
WLAN_EID_EDCA_PARAM_SET = 12,