From 1f95b353804b1568cc5c02eba05ccc62acf0f0a8 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 23 May 2013 23:09:56 +0200
Subject: [PATCH] --- yaml --- r: 376654 b: refs/heads/master c:
 1351c5d3b189a487fbacd5cdf2dc3e6faf12c682 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/mac80211/iface.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 60cc7335ceea..b5655610c6a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4325d724cd91643c727ca4cb063e8bb19989950b
+refs/heads/master: 1351c5d3b189a487fbacd5cdf2dc3e6faf12c682
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index 68f51c3af49f..00e2238355f0 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/net/mac80211/iface.c
@@ -474,6 +474,9 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
 			master->control_port_protocol;
 		sdata->control_port_no_encrypt =
 			master->control_port_no_encrypt;
+		sdata->vif.cab_queue = master->vif.cab_queue;
+		memcpy(sdata->vif.hw_queue, master->vif.hw_queue,
+		       sizeof(sdata->vif.hw_queue));
 		break;
 		}
 	case NL80211_IFTYPE_AP: