diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:20:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:20:45 -0500 |
| commit | 1d212aa96e1b63459486f729af9a3fa38768b801 (patch) | |
| tree | e91e74db57a5bb7884b4681cdb788d405ec8f10f /include/linux/ieee80211.h | |
| parent | 8c4877a4128e7931077b024a891a4b284d8756a3 (diff) | |
| parent | b7613370db5ba66ad81e41cd3a5417fde4d5e03c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'include/linux/ieee80211.h')
| -rw-r--r-- | include/linux/ieee80211.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index ed5a03cbe184..351c0ab4e284 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -1223,6 +1223,9 @@ enum ieee80211_eid { | |||
| 1223 | WLAN_EID_BSS_AC_ACCESS_DELAY = 68, | 1223 | WLAN_EID_BSS_AC_ACCESS_DELAY = 68, |
| 1224 | WLAN_EID_RRM_ENABLED_CAPABILITIES = 70, | 1224 | WLAN_EID_RRM_ENABLED_CAPABILITIES = 70, |
| 1225 | WLAN_EID_MULTIPLE_BSSID = 71, | 1225 | WLAN_EID_MULTIPLE_BSSID = 71, |
| 1226 | WLAN_EID_BSS_COEX_2040 = 72, | ||
| 1227 | WLAN_EID_OVERLAP_BSS_SCAN_PARAM = 74, | ||
| 1228 | WLAN_EID_EXT_CAPABILITY = 127, | ||
| 1226 | 1229 | ||
| 1227 | WLAN_EID_MOBILITY_DOMAIN = 54, | 1230 | WLAN_EID_MOBILITY_DOMAIN = 54, |
| 1228 | WLAN_EID_FAST_BSS_TRANSITION = 55, | 1231 | WLAN_EID_FAST_BSS_TRANSITION = 55, |