History

Merge branch '3.15-fixes' into mips-for-linux-next

Ralf Baechle committed 12 years ago

Commit f8647b52 parents 1d421ca f7a89f1396 files · +5489 −2523Browse files

Showing the changes to include/uapi/linux (1 of 396 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+3−1
@@ -3856,6 +3856,8 @@ enum nl80211_ap_sme_features { · 3855 unmodified lines
38563856 * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested
38573857 * to work properly to suppport receiving regulatory hints from
38583858 * cellular base stations.
3859+ * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: (no longer available, only
3860+ * here to reserve the value for API/ABI compatibility)
38593861 * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of
38603862 * equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station
38613863 * mode
@@ -3897,7 +3899,7 @@ enum nl80211_feature_flags { · 35 unmodified lines
38973899 NL80211_FEATURE_HT_IBSS = 1 << 1,
38983900 NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2,
38993901 NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3,
3900− /* bit 4 is reserved - don't use */
3902+ NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL = 1 << 4,
39013903 NL80211_FEATURE_SAE = 1 << 5,
39023904 NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6,
39033905 NL80211_FEATURE_SCAN_FLUSH = 1 << 7,