cdc_ether and usbnet are now set, update compat.diff

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

2 files changed, 249 insertions, 250 deletions

diff --git a/README b/README
index 5d064ed..e1c0af2 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ libertas, ipw2100 and ipw2200.
 If you'd like to keep the wireless-testing git repository local as well,
 please read out git-guide which explains how to achieve this:
 
-http://linuxwireless.org/en/developers/git-guide
+http://wireless.kernel.org/en/developers/git-guide
 
 With a local git repository you can update the compatibility package yourself. 
 For more information on how to do this please refer the Developers section below.
@@ -23,7 +23,7 @@ Documenation
 This package is also documented online and probably has more-up-to date
 information online than on this README file.
 
-http://linuxwireless.org/en/users/Download
+http://wireless.kernel.org/en/users/Download
 
 Where to get the latest
 -----------------------
@@ -33,7 +33,7 @@ checkout of wireless-testing.git. However since not many users are expected to k
 a local git repository of wireless-testing we provide daily snapshots of this
 package + the wireless subsystem code. You can find the latest snapshot at:
 
-http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-2.6.tar.bz2
+http://wireless.kernel.org/download/compat-wireless-2.6/compat-wireless-2.6.tar.bz2
 
 Building, and installing
 ------------------------
@@ -82,27 +82,27 @@ This is the list of drivers this package provides. It adds
 all new drivers or drivers which keep being updated which you might
 be interested in.
 
-Driver			2.6.22	2.6.23
-adm8211			?	?
-ath5k			OK	?
-b43			OK	?
-b43legacy		?	?
-iwl3945			OK	?
-iwl4965			?	?
-ipw2100			?	?
-ipw2200			?	?
-libertas_cs (Libertas)	?	?
-ub8xxx      (Libertas)	?	?
-p54pci			OK	?
-p54usb			?	?
-rt2400pci (rt2x00)	?	?
-rt2500pci (rt2x00)	OK	?
-rt2500usb (rt2x00)	?	?
-rt61pci	  (rt2x00)	?	?
-rt73usb	  (rt2x00)	?	?
-rtl8180	(Realtek)	OK	?
-rtl8187	(Realtek)	?	?
-zd1211rw-mac80211	OK	?
+Driver
+adm8211
+ath5k
+b43
+b43legacy
+iwl3945
+iwl4965
+ipw2100
+ipw2200
+libertas_cs (Libertas)
+ub8xxx      (Libertas)
+p54pci
+p54usb
+rt2400pci (rt2x00)
+rt2500pci (rt2x00)
+rt2500usb (rt2x00)
+rt61pci	  (rt2x00)
+rt73usb	  (rt2x00)
+rtl8180	(Realtek)
+rtl8187	(Realtek)
+zd1211rw
 
 Known issues
 ------------
@@ -170,7 +170,7 @@ Who:   John W. Linville <linville@tuxdriver.com>
 If your driver needs firmware please be sure to check the driver page
 for that driver here:
 
-http://linuxwireless.org/en/users/Drivers
+http://wireless.kernel.org/en/users/Drivers
 
 Why?
 ----
@@ -263,5 +263,5 @@ Patches for drivers
 If you'd like to send patches for a driver though you can send it using our 
 Submitting Patches guideline:
 
-http://linuxwireless.org/en/developers/SubmittingPatches
+http://wireless.kernel.org/en/developers/SubmittingPatches
 
diff --git a/compat/compat.diff b/compat/compat.diff
index 42a848e..e476fbe 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -101,30 +101,6 @@
 -cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o
 +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o compat.o
  cfg80211-$(CONFIG_NL80211) += nl80211.o
---- a/drivers/net/usb/Makefile	2008-02-28 19:54:52.000000000 +0100
-+++ b/drivers/net/usb/Makefile	2008-02-28 19:54:53.000000000 +0100
-@@ -2,21 +2,7 @@
- # Makefile for USB Network drivers
- #
- 
--obj-$(CONFIG_USB_CATC)		+= catc.o
--obj-$(CONFIG_USB_KAWETH)	+= kaweth.o
--obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
--obj-$(CONFIG_USB_RTL8150)	+= rtl8150.o
--obj-$(CONFIG_USB_NET_AX8817X)	+= asix.o
--obj-$(CONFIG_USB_NET_CDCETHER)	+= cdc_ether.o
--obj-$(CONFIG_USB_NET_DM9601)	+= dm9601.o
--obj-$(CONFIG_USB_NET_GL620A)	+= gl620a.o
--obj-$(CONFIG_USB_NET_NET1080)	+= net1080.o
--obj-$(CONFIG_USB_NET_PLUSB)	+= plusb.o
- obj-$(CONFIG_USB_NET_RNDIS_HOST)	+= rndis_host.o
--obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_subset.o
--obj-$(CONFIG_USB_NET_ZAURUS)	+= zaurus.o
--obj-$(CONFIG_USB_NET_MCS7830)	+= mcs7830.o
--obj-$(CONFIG_USB_USBNET)	+= usbnet.o
- 
- ifeq ($(CONFIG_USB_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
 --- a/drivers/net/wireless/Makefile	2008-03-11 19:54:52.000000000 +0100
 +++ b/drivers/net/wireless/Makefile	2008-03-11 19:54:53.000000000 +0100
 @@ -6,48 +6,13 @@ obj-$(CONFIG_IPW2100) += ipw2100.o
@@ -209,44 +185,6 @@
  	LED_SCANNING = 1,
  	LED_ASSOCIATED = 2,
  };
---- a/net/mac80211/util.c	2008-06-04 00:38:14.000000000 -0700
-+++ b/net/mac80211/util.c	2008-06-08 07:31:57.000000000 -0700
-@@ -20,11 +20,20 @@
- #include <linux/if_arp.h>
- #include <linux/wireless.h>
- #include <linux/bitmap.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- #include <net/net_namespace.h>
-+#endif
- #include <net/cfg80211.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
- #include <net/rtnetlink.h>
-+#else
-+#include <linux/rtnetlink.h>
-+#endif
- 
- #include "ieee80211_i.h"
-+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
-+#include "mq_compat.h"
-+#endif
- #include "rate.h"
- #include "mesh.h"
- #include "wme.h"
-@@ -331,7 +340,14 @@
- {
- 	struct ieee80211_local *local = hw_to_local(hw);
- 
-+/* 2.6.22 doesn't have CONFIG_NETDEVICES_MULTIQUEUE so lets not make use
-+ * of queues_pending map and use our own old hack */
-+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
-+	if (test_and_clear_bit(IEEE80211_LINK_STATE_XOFF,
-+		&local->state[queue])) {
-+#else
- 	if (test_bit(queue, local->queues_pending)) {
-+#endif
- 		tasklet_schedule(&local->tx_pending_tasklet);
- 	} else {
- 		if (ieee80211_is_multiqueue(local)) {
 --- a/drivers/net/wireless/libertas/dev.h	2008-04-15 19:25:05.000000000 -0700
 +++ b/drivers/net/wireless/libertas/dev.h	2008-04-15 19:28:16.000000000 -0700
 @@ -11,6 +11,7 @@
@@ -755,9 +693,194 @@
 -	zd_chip_control_leds(&mac->chip, LED_OFF);
 +	zd_chip_control_leds(&mac->chip, LED_OFF_ZD);
  }
---- a/net/mac80211/rx.c	2008-05-23 11:55:04.000000000 +0530
-+++ b/net/mac80211/rx.c	2008-05-23 11:55:05.000000000 +0530
-@@ -308,8 +308,13 @@
+--- a/net/mac80211/iface.c	2008-05-23 14:02:26.000000000 +0530
++++ b/net/mac80211/iface.c	2008-05-23 14:11:06.000000000 +0530
+@@ -53,6 +53,15 @@
+ 	if (!ndev)
+ 		return -ENOMEM;
+ 
++
++	/* 2.6.26 added ndev->needed_headroom and dev->needed_tailroom.
++	 * Then commit SHA1
++	 * f5184d267c1aedb9b7a8cc44e08ff6b8d382c3b5
++	 * added LL_ALLOCATED_SPACE and made most users of 
++	 * LL_RESERVED_SPACE make use LL_ALLOCATED_SPACE instead. We
++	 * let the old kernels through as they still are using
++	 * LL_ALLOCATED_SPACE */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))
+ 	ndev->needed_headroom = local->tx_headroom +
+ 				4*6 /* four MAC addresses */
+ 				+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
+@@ -61,6 +70,7 @@
+ 				- ETH_HLEN /* ethernet hard_header_len */
+ 				+ IEEE80211_ENCRYPT_HEADROOM;
+ 	ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
++#endif
+ 
+ 	ret = dev_alloc_name(ndev, ndev->name);
+ 	if (ret < 0)
+--- a/net/mac80211/ieee80211_i.h	2008-06-04 00:38:14.000000000 -0700
++++ b/net/mac80211/ieee80211_i.h	2008-06-08 05:49:26.000000000 -0700
+@@ -406,6 +406,10 @@
+ 
+ 	struct wireless_dev wdev;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
++	struct net_device_stats stats;
++#endif
++
+ 	/* keys */
+ 	struct list_head key_list;
+ 
+@@ -532,7 +536,7 @@
+ 	return container_of(p, struct ieee80211_sub_if_data, vif);
+ }
+ 
+-#define IEEE80211_DEV_TO_SUB_IF(dev) netdev_priv(dev)
++#define IEEE80211_DEV_TO_SUB_IF(dev) ((struct ieee80211_sub_if_data *)netdev_priv(dev))
+ 
+ enum {
+ 	IEEE80211_RX_MSG	= 1,
+@@ -589,7 +593,14 @@
+ 	struct sta_info *sta_hash[STA_HASH_SIZE];
+ 	struct timer_list sta_cleanup;
+ 
++/* Kernels without CONFIG_NETDEVICES_MULTIQUEUE (<=2.6.22) need this, so
++ * we implement multiple queue support internally with mac80211 hacks. */
++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
++	unsigned long state[IEEE80211_MAX_QUEUES + IEEE80211_MAX_AMPDU_QUEUES];
++#else
+ 	unsigned long queues_pending[BITS_TO_LONGS(IEEE80211_MAX_QUEUES)];
++#endif
++
+ 	struct ieee80211_tx_stored_packet pending_packet[IEEE80211_MAX_QUEUES];
+ 	struct tasklet_struct tx_pending_tasklet;
+ 
+--- a/net/mac80211/main.c	2008-06-11 13:10:36.000000000 -0700
++++ b/net/mac80211/main.c	2008-06-11 13:10:37.000000000 -0700
+@@ -21,7 +21,9 @@
+ #include <linux/wireless.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/bitmap.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ #include <net/net_namespace.h>
++#endif
+ #include <net/cfg80211.h>
+ 
+ #include "ieee80211_i.h"
+@@ -960,6 +962,13 @@
+ 	.cache_update	= eth_header_cache_update,
+ };
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
++static struct net_device_stats *ieee80211_get_stats(struct net_device *dev)
++{
++	return &IEEE80211_DEV_TO_SUB_IF(dev)->stats;
++}
++#endif
++
+ /* Must not be called for mdev */
+ void ieee80211_if_setup(struct net_device *dev)
+ {
+@@ -971,6 +980,9 @@
+ 	dev->open = ieee80211_open;
+ 	dev->stop = ieee80211_stop;
+ 	dev->destructor = ieee80211_if_free;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
++	dev->get_stats = ieee80211_get_stats;
++#endif
+ }
+ 
+ /* everything else */
+@@ -1677,7 +1689,12 @@
+ 	mdev->open = ieee80211_master_open;
+ 	mdev->stop = ieee80211_master_stop;
+ 	mdev->type = ARPHRD_IEEE80211;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
++	mdev->get_stats = ieee80211_get_stats;
++#endif
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ 	mdev->header_ops = &ieee80211_header_ops;
++#endif
+ 	mdev->set_multicast_list = ieee80211_master_set_multicast_list;
+ 
+ 	sdata->vif.type = IEEE80211_IF_TYPE_AP;
+--- a/include/net/mac80211.h	2008-06-04 00:38:13.000000000 -0700
++++ b/include/net/mac80211.h	2008-06-09 01:25:08.000000000 -0700
+@@ -293,7 +293,11 @@
+ 	s8 tx_rate_idx;
+ 	u8 antenna_sel_tx;
+ 
++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
++	u8 queue; /* For compatibilty support for HT for kernels <= 2.6.22 */
++#else
+ 	/* 1 byte hole */
++#endif
+ 
+ 	union {
+ 		struct {
+@@ -323,6 +327,20 @@
+ 	return (struct ieee80211_tx_info *)skb->cb;
+ }
+ 
++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
++/* Added was added as of 2.6.24 in include/linux/skbuff.h, this for old kernels,
++ * we put it here instead of compat.h as we don't want to rely on mac80211.h in
++ * compat.h */
++static inline u16 skb_get_queue_mapping(struct sk_buff *skb)
++{
++	return IEEE80211_SKB_CB(skb)->queue;
++}
++
++static inline void skb_set_queue_mapping(struct sk_buff *skb, u16 queue_mapping)
++{
++	IEEE80211_SKB_CB(skb)->queue = queue_mapping;
++}
++#endif
+ 
+ /**
+  * enum mac80211_rx_flags - receive flags
+--- a/net/mac80211/util.c	2008-06-20 16:39:59.000000000 +0530
++++ b/net/mac80211/util.c	2008-06-20 16:40:00.000000000 +0530
+@@ -20,11 +20,20 @@
+ #include <linux/if_arp.h>
+ #include <linux/wireless.h>
+ #include <linux/bitmap.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ #include <net/net_namespace.h>
++#endif
+ #include <net/cfg80211.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
+ #include <net/rtnetlink.h>
++#else
++#include <linux/rtnetlink.h>
++#endif
+ 
+ #include "ieee80211_i.h"
++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
++#include "mq_compat.h"
++#endif
+ #include "rate.h"
+ #include "mesh.h"
+ #include "wme.h"
+@@ -360,7 +369,14 @@
+ {
+ 	struct ieee80211_local *local = hw_to_local(hw);
+ 
++/* 2.6.22 doesn't have CONFIG_NETDEVICES_MULTIQUEUE so lets not make use
++ * of queues_pending map and use our own old hack */
++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
++	if (test_and_clear_bit(IEEE80211_LINK_STATE_XOFF,
++		&local->state[queue])) {
++#else
+ 	if (test_bit(queue, local->queues_pending)) {
++#endif
+ 		tasklet_schedule(&local->tx_pending_tasklet);
+ 	} else {
+ 		if (ieee80211_is_multiqueue(local)) {
+--- a/net/mac80211/rx.c	2008-06-20 16:39:59.000000000 +0530
++++ b/net/mac80211/rx.c	2008-06-20 16:40:00.000000000 +0530
+@@ -305,8 +305,13 @@
  		}
  
  		prev_dev = sdata->dev;
@@ -771,7 +894,7 @@
  	}
  
  	if (prev_dev) {
-@@ -1400,8 +1405,13 @@
+@@ -1397,8 +1402,13 @@
  
  	skb->dev = dev;
  
@@ -785,7 +908,7 @@
  
  	/* skip the wrapping header */
  	eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr));
-@@ -1510,8 +1520,13 @@
+@@ -1507,8 +1517,13 @@
  
  	rx->skb->dev = dev;
  
@@ -799,7 +922,7 @@
  
  	ieee80211_deliver_skb(rx);
  
-@@ -1717,8 +1732,13 @@
+@@ -1714,8 +1729,13 @@
  		}
  
  		prev_dev = sdata->dev;
@@ -813,34 +936,8 @@
  	}
  
  	if (prev_dev) {
---- a/net/mac80211/iface.c	2008-05-23 14:02:26.000000000 +0530
-+++ b/net/mac80211/iface.c	2008-05-23 14:11:06.000000000 +0530
-@@ -53,6 +53,15 @@
- 	if (!ndev)
- 		return -ENOMEM;
- 
-+
-+	/* 2.6.26 added ndev->needed_headroom and dev->needed_tailroom.
-+	 * Then commit SHA1
-+	 * f5184d267c1aedb9b7a8cc44e08ff6b8d382c3b5
-+	 * added LL_ALLOCATED_SPACE and made most users of 
-+	 * LL_RESERVED_SPACE make use LL_ALLOCATED_SPACE instead. We
-+	 * let the old kernels through as they still are using
-+	 * LL_ALLOCATED_SPACE */
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))
- 	ndev->needed_headroom = local->tx_headroom +
- 				4*6 /* four MAC addresses */
- 				+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -61,6 +70,7 @@
- 				- ETH_HLEN /* ethernet hard_header_len */
- 				+ IEEE80211_ENCRYPT_HEADROOM;
- 	ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
-+#endif
- 
- 	ret = dev_alloc_name(ndev, ndev->name);
- 	if (ret < 0)
---- a/net/mac80211/tx.c	2008-06-04 00:38:14.000000000 -0700
-+++ b/net/mac80211/tx.c	2008-06-08 06:03:45.000000000 -0700
+--- a/net/mac80211/tx.c	2008-06-20 16:39:59.000000000 +0530
++++ b/net/mac80211/tx.c	2008-06-20 16:40:00.000000000 +0530
 @@ -18,12 +18,17 @@
  #include <linux/etherdevice.h>
  #include <linux/bitmap.h>
@@ -867,8 +964,8 @@
  static int inline is_ieee80211_device(struct net_device *dev,
  				      struct net_device *master)
  {
-@@ -665,8 +671,12 @@
- 	 * etc.
+@@ -664,8 +670,12 @@
+ 	 * caution taken here as fragmented ampdu may cause Tx stop.
  	 */
  	if (WARN_ON(tx->flags & IEEE80211_TX_CTL_AMPDU ||
 +#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
@@ -982,129 +1079,8 @@
  			ieee80211_wake_queue(&local->hw, i);
  		}
  	}
---- a/net/mac80211/ieee80211_i.h	2008-06-04 00:38:14.000000000 -0700
-+++ b/net/mac80211/ieee80211_i.h	2008-06-08 05:49:26.000000000 -0700
-@@ -406,6 +406,10 @@
- 
- 	struct wireless_dev wdev;
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
-+	struct net_device_stats stats;
-+#endif
-+
- 	/* keys */
- 	struct list_head key_list;
- 
-@@ -532,7 +536,7 @@
- 	return container_of(p, struct ieee80211_sub_if_data, vif);
- }
- 
--#define IEEE80211_DEV_TO_SUB_IF(dev) netdev_priv(dev)
-+#define IEEE80211_DEV_TO_SUB_IF(dev) ((struct ieee80211_sub_if_data *)netdev_priv(dev))
- 
- enum {
- 	IEEE80211_RX_MSG	= 1,
-@@ -589,7 +593,14 @@
- 	struct sta_info *sta_hash[STA_HASH_SIZE];
- 	struct timer_list sta_cleanup;
- 
-+/* Kernels without CONFIG_NETDEVICES_MULTIQUEUE (<=2.6.22) need this, so
-+ * we implement multiple queue support internally with mac80211 hacks. */
-+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
-+	unsigned long state[IEEE80211_MAX_QUEUES + IEEE80211_MAX_AMPDU_QUEUES];
-+#else
- 	unsigned long queues_pending[BITS_TO_LONGS(IEEE80211_MAX_QUEUES)];
-+#endif
-+
- 	struct ieee80211_tx_stored_packet pending_packet[IEEE80211_MAX_QUEUES];
- 	struct tasklet_struct tx_pending_tasklet;
- 
---- a/net/mac80211/main.c	2008-06-11 13:10:36.000000000 -0700
-+++ b/net/mac80211/main.c	2008-06-11 13:10:37.000000000 -0700
-@@ -21,7 +21,9 @@
- #include <linux/wireless.h>
- #include <linux/rtnetlink.h>
- #include <linux/bitmap.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- #include <net/net_namespace.h>
-+#endif
- #include <net/cfg80211.h>
- 
- #include "ieee80211_i.h"
-@@ -960,6 +962,13 @@
- 	.cache_update	= eth_header_cache_update,
- };
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
-+static struct net_device_stats *ieee80211_get_stats(struct net_device *dev)
-+{
-+	return &IEEE80211_DEV_TO_SUB_IF(dev)->stats;
-+}
-+#endif
-+
- /* Must not be called for mdev */
- void ieee80211_if_setup(struct net_device *dev)
- {
-@@ -971,6 +980,9 @@
- 	dev->open = ieee80211_open;
- 	dev->stop = ieee80211_stop;
- 	dev->destructor = ieee80211_if_free;
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
-+	dev->get_stats = ieee80211_get_stats;
-+#endif
- }
- 
- /* everything else */
-@@ -1677,7 +1689,12 @@
- 	mdev->open = ieee80211_master_open;
- 	mdev->stop = ieee80211_master_stop;
- 	mdev->type = ARPHRD_IEEE80211;
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
-+	mdev->get_stats = ieee80211_get_stats;
-+#endif
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- 	mdev->header_ops = &ieee80211_header_ops;
-+#endif
- 	mdev->set_multicast_list = ieee80211_master_set_multicast_list;
- 
- 	sdata->vif.type = IEEE80211_IF_TYPE_AP;
---- a/include/net/mac80211.h	2008-06-04 00:38:13.000000000 -0700
-+++ b/include/net/mac80211.h	2008-06-09 01:25:08.000000000 -0700
-@@ -293,7 +293,11 @@
- 	s8 tx_rate_idx;
- 	u8 antenna_sel_tx;
- 
-+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
-+	u8 queue; /* For compatibilty support for HT for kernels <= 2.6.22 */
-+#else
- 	/* 1 byte hole */
-+#endif
- 
- 	union {
- 		struct {
-@@ -323,6 +327,20 @@
- 	return (struct ieee80211_tx_info *)skb->cb;
- }
- 
-+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
-+/* Added was added as of 2.6.24 in include/linux/skbuff.h, this for old kernels,
-+ * we put it here instead of compat.h as we don't want to rely on mac80211.h in
-+ * compat.h */
-+static inline u16 skb_get_queue_mapping(struct sk_buff *skb)
-+{
-+	return IEEE80211_SKB_CB(skb)->queue;
-+}
-+
-+static inline void skb_set_queue_mapping(struct sk_buff *skb, u16 queue_mapping)
-+{
-+	IEEE80211_SKB_CB(skb)->queue = queue_mapping;
-+}
-+#endif
- 
- /**
-  * enum mac80211_rx_flags - receive flags
---- a/net/mac80211/wme.c	2008-06-09 02:06:22.000000000 -0700
-+++ b/net/mac80211/wme.c	2008-06-09 02:09:30.000000000 -0700
+--- a/net/mac80211/wme.c	2008-06-20 16:39:59.000000000 +0530
++++ b/net/mac80211/wme.c	2008-06-20 16:40:00.000000000 +0530
 @@ -17,6 +17,9 @@
  #include <net/mac80211.h>
  #include "ieee80211_i.h"
@@ -1115,7 +1091,7 @@
  
  /* maximum number of hardware queues we support. */
  #define QD_MAX_QUEUES (IEEE80211_MAX_AMPDU_QUEUES + IEEE80211_MAX_QUEUES)
-@@ -328,14 +331,22 @@
+@@ -320,14 +323,22 @@
  
  
  /* called whenever parameters are updated on existing qdisc */
@@ -1138,7 +1114,7 @@
  {
  	struct ieee80211_sched_data *q = qdisc_priv(qd);
  	struct net_device *dev = qd->dev;
-@@ -456,7 +467,11 @@
+@@ -448,7 +459,11 @@
  
  
  static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent,
@@ -1150,7 +1126,7 @@
  {
  	unsigned long cl = *arg;
  	struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
-@@ -540,7 +555,11 @@
+@@ -532,7 +547,11 @@
  
  /* this qdisc is classful (i.e. has classes, some of which may have leaf qdiscs attached)
   * - these are the operations on the classes */
@@ -1162,3 +1138,26 @@
  {
  	.graft = wme_classop_graft,
  	.leaf = wme_classop_leaf,
+--- a/drivers/net/usb/Makefile	2008-06-20 16:59:51.000000000 +0530
++++ b/drivers/net/usb/Makefile	2008-06-20 16:59:51.000000000 +0530
+@@ -2,20 +2,8 @@
+ # Makefile for USB Network drivers
+ #
+ 
+-obj-$(CONFIG_USB_CATC)		+= catc.o
+-obj-$(CONFIG_USB_KAWETH)	+= kaweth.o
+-obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
+-obj-$(CONFIG_USB_RTL8150)	+= rtl8150.o
+-obj-$(CONFIG_USB_NET_AX8817X)	+= asix.o
+ obj-$(CONFIG_USB_NET_CDCETHER)	+= cdc_ether.o
+-obj-$(CONFIG_USB_NET_DM9601)	+= dm9601.o
+-obj-$(CONFIG_USB_NET_GL620A)	+= gl620a.o
+-obj-$(CONFIG_USB_NET_NET1080)	+= net1080.o
+-obj-$(CONFIG_USB_NET_PLUSB)	+= plusb.o
+ obj-$(CONFIG_USB_NET_RNDIS_HOST)	+= rndis_host.o
+-obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_subset.o
+-obj-$(CONFIG_USB_NET_ZAURUS)	+= zaurus.o
+-obj-$(CONFIG_USB_NET_MCS7830)	+= mcs7830.o
+ obj-$(CONFIG_USB_USBNET)	+= usbnet.o
+ 
+ ifeq ($(CONFIG_USB_DEBUG),y)