diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-29 12:55:38 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-29 12:55:38 -0400 |
| commit | 737be10d8cb783d1cadb1868b061abb2b4314eae (patch) | |
| tree | 1b72ea0d454affab6d6cc743939cfb316fad14b3 /include/linux | |
| parent | 03c4444650969431b3a5effde4995de767e3013a (diff) | |
| parent | d3a58df87a2e4c2301ac843604202d290a48440b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ieee80211.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index f194ccb8539c..6bff13f74050 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -1711,6 +1711,7 @@ enum ieee80211_eid { | |||
| 1711 | WLAN_EID_RRM_ENABLED_CAPABILITIES = 70, | 1711 | WLAN_EID_RRM_ENABLED_CAPABILITIES = 70, |
| 1712 | WLAN_EID_MULTIPLE_BSSID = 71, | 1712 | WLAN_EID_MULTIPLE_BSSID = 71, |
| 1713 | WLAN_EID_BSS_COEX_2040 = 72, | 1713 | WLAN_EID_BSS_COEX_2040 = 72, |
| 1714 | WLAN_EID_BSS_INTOLERANT_CHL_REPORT = 73, | ||
| 1714 | WLAN_EID_OVERLAP_BSS_SCAN_PARAM = 74, | 1715 | WLAN_EID_OVERLAP_BSS_SCAN_PARAM = 74, |
| 1715 | WLAN_EID_RIC_DESCRIPTOR = 75, | 1716 | WLAN_EID_RIC_DESCRIPTOR = 75, |
| 1716 | WLAN_EID_MMIE = 76, | 1717 | WLAN_EID_MMIE = 76, |