diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-06-02 11:20:17 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-06-02 11:20:17 -0400 |
| commit | fcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0 (patch) | |
| tree | a17982638b066ae29f8ab1a6e37f18e6dddb5272 /include/linux | |
| parent | 96b2e73c5471542cb9c622c4360716684f8797ed (diff) | |
| parent | a715c7ddd65a1a3b2839b8ebd759bb2d361f7675 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
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, |