From patchwork Thu Feb 10 01:05:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 545081 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1A16FxA002528 for ; Thu, 10 Feb 2011 01:06:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751806Ab1BJBGO (ORCPT ); Wed, 9 Feb 2011 20:06:14 -0500 Received: from mail.candelatech.com ([208.74.158.172]:60024 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751235Ab1BJBGO (ORCPT ); Wed, 9 Feb 2011 20:06:14 -0500 Received: from localhost.localdomain (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id p1A15r6o025873 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 9 Feb 2011 17:05:55 -0800 From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH 2/2] mac80211: Set up tx-queue-mapping in subif_start_xmit. Date: Wed, 9 Feb 2011 17:05:51 -0800 Message-Id: <1297299951-25604-2-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1297299951-25604-1-git-send-email-greearb@candelatech.com> References: <1297299951-25604-1-git-send-email-greearb@candelatech.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 10 Feb 2011 01:06:16 +0000 (UTC) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 17ef4f4..95eb4fa 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2028,6 +2028,8 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, } else memcpy(skb_push(skb, hdrlen), &hdr, hdrlen); + skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, skb)); + nh_pos += hdrlen; h_pos += hdrlen;