diff --git a/[refs] b/[refs]
index 60140e87047a..c868d3a8d5fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c75786c9ef9e726dc139325a775e90a684b00ed7
+refs/heads/master: 9533b4ac86e20656d95f25e536c81c994e5f57a6
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 2f01d84ca52f..2e752df57510 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -954,6 +954,8 @@ struct ieee80211_sta {
 	u16 aid;
 	struct ieee80211_sta_ht_cap ht_cap;
 	bool wme;
+	u8 uapsd_queues;
+	u8 max_sp;
 
 	/* must be last */
 	u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 6ab67ab34b5c..0baaaecf4558 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -697,6 +697,9 @@ static void sta_apply_parameters(struct ieee80211_local *local,
 	}
 	spin_unlock_irqrestore(&sta->flaglock, flags);
 
+	sta->sta.uapsd_queues = params->uapsd_queues;
+	sta->sta.max_sp = params->max_sp;
+
 	/*
 	 * cfg80211 validates this (1-2007) and allows setting the AID
 	 * only when creating a new station entry