diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-15 16:24:28 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-15 16:24:28 +0200 |
| commit | 025a58fd9d5785d63c398e96ac543db2639c7ddc (patch) | |
| tree | f15063ac321fb1d13e35bc75c70e7cee81aa3119 /include | |
| parent | net: filter: s390: fix JIT address randomization (diff) | |
| parent | ath9k_htc: Stop ANI before doing hw_reset (diff) | |
| download | linux-025a58fd9d5785d63c398e96ac543db2639c7ddc.tar.xz linux-025a58fd9d5785d63c398e96ac543db2639c7ddc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/nl80211.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 1ba9d626aa83..194c1eab04d8 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -3856,6 +3856,8 @@ enum nl80211_ap_sme_features { * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested * to work properly to suppport receiving regulatory hints from * cellular base stations. + * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: (no longer available, only + * here to reserve the value for API/ABI compatibility) * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of * equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station * mode @@ -3897,7 +3899,7 @@ enum nl80211_feature_flags { NL80211_FEATURE_HT_IBSS = 1 << 1, NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2, NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3, - /* bit 4 is reserved - don't use */ + NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL = 1 << 4, NL80211_FEATURE_SAE = 1 << 5, NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6, NL80211_FEATURE_SCAN_FLUSH = 1 << 7, |