History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

John W. Linville committed 13 years ago

Commit 8024dc12 parents fd3065b 9e2ff36147 files · +2860 −1428Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+16−0
@@ -1303,6 +1303,13 @@ enum nl80211_commands { · 1302 unmodified lines
13031303 *
13041304 * @NL80211_ATTR_SCAN_FLAGS: scan request control flags (u32)
13051305 *
1306+ * @NL80211_ATTR_P2P_CTWINDOW: P2P GO Client Traffic Window (u8), used with
1307+ * the START_AP and SET_BSS commands
1308+ * @NL80211_ATTR_P2P_OPPPS: P2P GO opportunistic PS (u8), used with the
1309+ * START_AP and SET_BSS commands. This can have the values 0 or 1;
1310+ * if not given in START_AP 0 is assumed, if not given in SET_BSS
1311+ * no change is made.
1312+ *
13061313 * @NL80211_ATTR_MAX: highest attribute number currently defined
13071314 * @__NL80211_ATTR_AFTER_LAST: internal use
13081315 */
@@ -1570,6 +1577,9 @@ enum nl80211_attrs { · 261 unmodified lines
15701577 NL80211_ATTR_CENTER_FREQ1,
15711578 NL80211_ATTR_CENTER_FREQ2,
15721579
1580+ NL80211_ATTR_P2P_CTWINDOW,
1581+ NL80211_ATTR_P2P_OPPPS,
1582+
15731583 /* add attributes here, update the policy in nl80211.c */
15741584
15751585 __NL80211_ATTR_AFTER_LAST,
@@ -3126,6 +3136,10 @@ enum nl80211_ap_sme_features { · 1550 unmodified lines
31263136 * @NL80211_FEATURE_NEED_OBSS_SCAN: The driver expects userspace to perform
31273137 * OBSS scans and generate 20/40 BSS coex reports. This flag is used only
31283138 * for drivers implementing the CONNECT API, for AUTH/ASSOC it is implied.
3139+ * @NL80211_FEATURE_P2P_GO_CTWIN: P2P GO implementation supports CT Window
3140+ * setting
3141+ * @NL80211_FEATURE_P2P_GO_OPPPS: P2P GO implementation supports opportunistic
3142+ * powersave
31293143 */
31303144 enum nl80211_feature_flags {
31313145 NL80211_FEATURE_SK_TX_STATUS = 1 << 0,
@@ -3139,6 +3153,8 @@ enum nl80211_feature_flags { · 7 unmodified lines
31393153 NL80211_FEATURE_AP_SCAN = 1 << 8,
31403154 NL80211_FEATURE_VIF_TXPOWER = 1 << 9,
31413155 NL80211_FEATURE_NEED_OBSS_SCAN = 1 << 10,
3156+ NL80211_FEATURE_P2P_GO_CTWIN = 1 << 11,
3157+ NL80211_FEATURE_P2P_GO_OPPPS = 1 << 12,
31423158 };
31433159
31443160 /**