From patchwork Thu Jan  7 14:01:42 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lennert Buytenhek <buytenh@wantstofly.org>
X-Patchwork-Id: 71583
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o07E1lxn011333
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Thu, 7 Jan 2010 14:01:48 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752266Ab0AGOBq (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Thu, 7 Jan 2010 09:01:46 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752315Ab0AGOBp
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Thu, 7 Jan 2010 09:01:45 -0500
Received: from fw.wantstofly.org ([80.101.37.227]:39180 "EHLO
	mail.wantstofly.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752266Ab0AGOBp (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Thu, 7 Jan 2010 09:01:45 -0500
Received: by mail.wantstofly.org (Postfix, from userid 500)
	id 4544818E202; Thu,  7 Jan 2010 15:01:42 +0100 (CET)
Date: Thu, 7 Jan 2010 15:01:42 +0100
From: Lennert Buytenhek <buytenh@wantstofly.org>
To: Johannes Berg <johannes@sipsolutions.net>,
	John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: mac80211: fix queue selection for packets injected via monitor
	interface
Message-ID: <20100107140137.GA32125@mail.wantstofly.org>
References: <1262710858.28653.5.camel@johannes.local>
Mime-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1262710858.28653.5.camel@johannes.local>
User-Agent: Mutt/1.4.2.2i
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index c20dddd..2f34662 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -699,6 +699,7 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
 		return ieee802_1d_to_ac[skb->priority];
 	}
 
+	skb->priority = 0;
 	return ieee80211_downgrade_queue(local, skb);
 }