From c3cf3bdf05d898b81b6f09f5332e5bcb9f298e33 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 8 Nov 2011 09:20:07 +0100
Subject: [PATCH] --- yaml --- r: 275681 b: refs/heads/master c:
 c26887d2a48600bfa87a27ce41ff78828bd7243c h: refs/heads/master i:   275679:
 0d278dba94b5d78382fdbe568ececf2c01c0a04e v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/cfg80211.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 34636307e89c..bae9f4ecb66c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9270fd61a3b3efecb06d77f71efec6fb7daccb25
+refs/heads/master: c26887d2a48600bfa87a27ce41ff78828bd7243c
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index 92cf1c2c30c9..95852e36713b 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/include/net/cfg80211.h
@@ -456,6 +456,9 @@ enum station_parameters_apply_mask {
  *	as the AC bitmap in the QoS info field
  * @max_sp: max Service Period. same format as the MAX_SP in the
  *	QoS info field (but already shifted down)
+ * @sta_modify_mask: bitmap indicating which parameters changed
+ *	(for those that don't have a natural "no change" value),
+ *	see &enum station_parameters_apply_mask
  */
 struct station_parameters {
 	u8 *supported_rates;
@@ -615,6 +618,7 @@ struct sta_bss_parameters {
  *	user space MLME/SME implementation. The information is provided for
  *	the cfg80211_new_sta() calls to notify user space of the IEs.
  * @assoc_req_ies_len: Length of assoc_req_ies buffer in octets.
+ * @sta_flags: station flags mask & values
  */
 struct station_info {
 	u32 filled;