3.14-stable patches

added patches:
	nl80211-move-set_qos_map-command-into-split-state.patch

diff --git a/queue-3.14/nl80211-move-set_qos_map-command-into-split-state.patch b/queue-3.14/nl80211-move-set_qos_map-command-into-split-state.patch
new file mode 100644 (file)
index 0000000..9b82dfd
--- /dev/null
+++ b/queue-3.14/nl80211-move-set_qos_map-command-into-split-state.patch
@@ -0,0 +1,48 @@
+From 02df00eb0019e7d15a1fcddebe4d020226c1ccda Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Tue, 10 Jun 2014 14:06:25 +0200
+Subject: nl80211: move set_qos_map command into split state
+
+From: Johannes Berg <johannes.berg@intel.com>
+
+commit 02df00eb0019e7d15a1fcddebe4d020226c1ccda upstream.
+
+The non-split wiphy state shouldn't be increased in size
+so move the new set_qos_map command into the split if
+statement.
+
+Fixes: fa9ffc745610 ("cfg80211: Add support for QoS mapping")
+Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/wireless/nl80211.c |   11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -1450,18 +1450,17 @@ static int nl80211_send_wiphy(struct cfg
+               }
+               CMD(start_p2p_device, START_P2P_DEVICE);
+               CMD(set_mcast_rate, SET_MCAST_RATE);
++#ifdef CONFIG_NL80211_TESTMODE
++              CMD(testmode_cmd, TESTMODE);
++#endif
+               if (state->split) {
+                       CMD(crit_proto_start, CRIT_PROTOCOL_START);
+                       CMD(crit_proto_stop, CRIT_PROTOCOL_STOP);
+                       if (dev->wiphy.flags & WIPHY_FLAG_HAS_CHANNEL_SWITCH)
+                               CMD(channel_switch, CHANNEL_SWITCH);
++                      CMD(set_qos_map, SET_QOS_MAP);
+               }
+-              CMD(set_qos_map, SET_QOS_MAP);
+-
+-#ifdef CONFIG_NL80211_TESTMODE
+-              CMD(testmode_cmd, TESTMODE);
+-#endif
+-
++              /* add into the if now */
+ #undef CMD
+ 
+               if (dev->ops->connect || dev->ops->auth) {

diff --git a/queue-3.14/series b/queue-3.14/series
index 9bc56b9588ce49d13737b055675fdbe41913da3a..9cc171793d18576acb1667ef2e7857a1cb5cccb9 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -25,3 +25,4 @@ drm-radeon-fix-cut-and-paste-issue-for-hawaii.patch
 mm-hugetlb-fix-copy_hugetlb_page_range.patch
 fix-gcc-4.9.0-miscompilation-of-load_balance-in-scheduler.patch
 x86-efi-include-a-.bss-section-within-the-pe-coff-headers.patch
+nl80211-move-set_qos_map-command-into-split-state.patch