[PATCH v2 2/2] mac80211: select queue for fwded mesh frames

[Thomas Pedersen <thomas@cozybit.com>]

Set proper queue mapping and timestamp for forwarded mesh frames.

Thanks to Luis Rodriguez for investigating and fixing this.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>

---
v2:
	We were already doing this for mcast frames, so don't duplicate
	the code.

 net/mac80211/rx.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b867bd5..1408472 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1952,13 +1952,15 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 			info = IEEE80211_SKB_CB(fwd_skb);
 			memset(info, 0, sizeof(*info));
 			info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
+			info->control.jiffies = jiffies;
 			info->control.vif = &rx->sdata->vif;
+			skb_set_queue_mapping(fwd_skb,
+				ieee80211_select_queue(sdata, fwd_skb));
+			ieee80211_set_qos_hdr(sdata, fwd_skb);
+
 			if (is_multicast_ether_addr(fwd_hdr->addr1)) {
 				IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
 								fwded_mcast);
-				skb_set_queue_mapping(fwd_skb,
-					ieee80211_select_queue(sdata, fwd_skb));
-				ieee80211_set_qos_hdr(sdata, fwd_skb);
 			} else {
 				int err;
 				/*
-- 
1.7.5.4