Update compat.diff

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

1 files changed, 79 insertions, 79 deletions

diff --git a/compat/compat.diff b/compat/compat.diff
index 47b7847..6be9626 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -476,28 +476,6 @@
  
  	u32 nar;
  
---- a/net/mac80211/ieee80211_i.h	2008-05-23 11:55:04.000000000 +0530
-+++ b/net/mac80211/ieee80211_i.h	2008-05-23 11:55:05.000000000 +0530
-@@ -404,6 +404,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;
- 
-@@ -530,7 +534,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,
 --- a/drivers/net/wireless/adm8211.c	2008-05-23 11:55:04.000000000 +0530
 +++ b/drivers/net/wireless/adm8211.c	2008-05-23 11:55:05.000000000 +0530
 @@ -143,7 +143,11 @@
@@ -757,32 +735,6 @@
 -	zd_chip_control_leds(&mac->chip, LED_OFF);
 +	zd_chip_control_leds(&mac->chip, LED_OFF_ZD);
  }
---- a/net/mac80211/tx.c	2008-05-23 11:55:04.000000000 +0530
-+++ b/net/mac80211/tx.c	2008-05-23 11:55:05.000000000 +0530
-@@ -18,7 +18,9 @@
- #include <linux/etherdevice.h>
- #include <linux/bitmap.h>
- #include <linux/rcupdate.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- #include <net/net_namespace.h>
-+#endif
- #include <net/ieee80211_radiotap.h>
- #include <net/cfg80211.h>
- #include <net/mac80211.h>
-@@ -1575,8 +1577,13 @@
- 	info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;
- 
- 	skb->dev = local->mdev;
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
-+	sdata->stats.tx_packets++;
-+	sdata->stats.tx_bytes += skb->len;
-+#else
- 	dev->stats.tx_packets++;
- 	dev->stats.tx_bytes += skb->len;
-+#endif
- 
- 	/* Update skb pointers to various headers since this modified frame
- 	 * is going to go through Linux networking code that may potentially
 --- 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 @@
@@ -841,8 +793,82 @@
  	}
  
  	if (prev_dev) {
---- a/net/mac80211/main.c	2008-05-23 11:55:04.000000000 +0530
-+++ b/net/mac80211/main.c	2008-05-23 11:55:05.000000000 +0530
+--- 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 01:25:08.000000000 -0700
++++ b/net/mac80211/tx.c	2008-06-04 01:25:09.000000000 -0700
+@@ -18,7 +18,9 @@
+ #include <linux/etherdevice.h>
+ #include <linux/bitmap.h>
+ #include <linux/rcupdate.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ #include <net/net_namespace.h>
++#endif
+ #include <net/ieee80211_radiotap.h>
+ #include <net/cfg80211.h>
+ #include <net/mac80211.h>
+@@ -1613,8 +1615,13 @@
+ 	info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;
+ 
+ 	skb->dev = local->mdev;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
++	sdata->stats.tx_packets++;
++	sdata->stats.tx_bytes += skb->len;
++#else
+ 	dev->stats.tx_packets++;
+ 	dev->stats.tx_bytes += skb->len;
++#endif
+ 
+ 	/* Update skb pointers to various headers since this modified frame
+ 	 * is going to go through Linux networking code that may potentially
+--- a/net/mac80211/ieee80211_i.h	2008-06-04 01:25:08.000000000 -0700
++++ b/net/mac80211/ieee80211_i.h	2008-06-04 01:25:09.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,
+--- a/net/mac80211/main.c	2008-06-04 01:25:08.000000000 -0700
++++ b/net/mac80211/main.c	2008-06-04 01:25:09.000000000 -0700
 @@ -21,7 +21,9 @@
  #include <linux/wireless.h>
  #include <linux/rtnetlink.h>
@@ -853,7 +879,7 @@
  #include <net/cfg80211.h>
  
  #include "ieee80211_i.h"
-@@ -955,6 +957,13 @@
+@@ -959,6 +961,13 @@
  	.cache_update	= eth_header_cache_update,
  };
  
@@ -867,7 +893,7 @@
  /* Must not be called for mdev */
  void ieee80211_if_setup(struct net_device *dev)
  {
-@@ -966,6 +975,9 @@
+@@ -970,6 +979,9 @@
  	dev->open = ieee80211_open;
  	dev->stop = ieee80211_stop;
  	dev->destructor = ieee80211_if_free;
@@ -877,7 +903,7 @@
  }
  
  /* everything else */
-@@ -1672,7 +1684,12 @@
+@@ -1676,7 +1688,12 @@
  	mdev->open = ieee80211_master_open;
  	mdev->stop = ieee80211_master_stop;
  	mdev->type = ARPHRD_IEEE80211;
@@ -890,29 +916,3 @@
  	mdev->set_multicast_list = ieee80211_master_set_multicast_list;
  
  	sdata->vif.type = IEEE80211_IF_TYPE_AP;
---- 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)