From patchwork Thu Jan 21 02:55:47 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Luis Chamberlain <mcgrof@bombadil.infradead.org>
X-Patchwork-Id: 74158
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 o0L2tuCj020165
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Thu, 21 Jan 2010 02:55:56 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753113Ab0AUCzs (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Wed, 20 Jan 2010 21:55:48 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752286Ab0AUCzs
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Wed, 20 Jan 2010 21:55:48 -0500
Received: from bombadil.infradead.org ([18.85.46.34]:40668 "EHLO
	bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752565Ab0AUCzr (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Wed, 20 Jan 2010 21:55:47 -0500
Received: from mcgrof by bombadil.infradead.org with local (Exim 4.69 #1
	(Red Hat Linux)) id 1NXnD1-00045e-5u
	for linux-wireless@vger.kernel.org; Thu, 21 Jan 2010 02:55:47 +0000
Date: Wed, 20 Jan 2010 21:55:47 -0500
From: "Luis R. Rodriguez" <mcgrof@bombadil.infradead.org>
To: linux-wireless <linux-wireless@vger.kernel.org>
Subject: RFC/RFT: compat-wireless for 2.6.32.4 - MQ backport support
Message-ID: <20100121025546.GB8069@bombadil.infradead.org>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.19 (2009-01-05)
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


--- a/net/mac80211/util.c	2010-01-20 18:35:04.000000000 -0800
+++ a/net/mac80211/util.c	2010-01-20 18:34:11.000000000 -0800
@@ -287,7 +287,13 @@
 
 	rcu_read_lock();
 	list_for_each_entry_rcu(sdata, &local->interfaces, list)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
 		netif_tx_wake_queue(netdev_get_tx_queue(sdata->dev, queue));
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
+		netif_start_subqueue(sdata->dev, queue);
+#else
+		netif_wake_queue(sdata->dev);
+#endif
 	rcu_read_unlock();
 }
 
@@ -322,7 +328,13 @@
 
 	rcu_read_lock();
 	list_for_each_entry_rcu(sdata, &local->interfaces, list)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
 		netif_tx_stop_queue(netdev_get_tx_queue(sdata->dev, queue));
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
+		netif_stop_subqueue(sdata->dev, queue);
+#else
+		netif_stop_queue(sdata->dev);
+#endif
 	rcu_read_unlock();
 }