From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pz0-f42.google.com ([209.85.210.42]:58105 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750710Ab1JTH1G (ORCPT ); Thu, 20 Oct 2011 03:27:06 -0400 Received: by pzk36 with SMTP id 36so6356708pzk.1 for ; Thu, 20 Oct 2011 00:27:05 -0700 (PDT) From: Thomas Pedersen To: linux-wireless@vger.kernel.org Cc: Thomas Pedersen , johannes@sipsolutions.net, linville@tuxdriver.com Subject: [PATCH v2 3/3] mac80211: select queue for fwded mesh frames Date: Thu, 20 Oct 2011 00:26:55 -0700 Message-Id: <1319095615-1368-1-git-send-email-thomas@cozybit.com> (sfid-20111020_092855_071795_0ACB1285) In-Reply-To: <1319070203-22097-1-git-send-email-thomas@cozybit.com> References: <1319070203-22097-1-git-send-email-thomas@cozybit.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: Set proper queue mapping and timestamp for forwarded mesh frames. Thanks to Luis Rodriguez for investigating and fixing this. Signed-off-by: Thomas Pedersen --- 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