[PATCH 3/3] 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>
---
 net/mac80211/rx.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b867bd5..8c03d6e 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1952,6 +1952,7 @@ 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;
 			if (is_multicast_ether_addr(fwd_hdr->addr1)) {
 				IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
@@ -1974,6 +1975,10 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 				if (err)
 					return RX_DROP_MONITOR;
 
+				skb_set_queue_mapping(fwd_skb,
+					ieee80211_select_queue(sdata, fwd_skb));
+				ieee80211_set_qos_hdr(sdata, fwd_skb);
+
 				IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
 								fwded_unicast);
 			}
-- 
1.7.5.4