Add 2.6.22 patch thanks to Mariusz Czubacki <mariusz.czubacki@gmail.com>

Package-Manager: portage-2.1.3.4

4 files changed, 72 insertions, 9 deletions

diff --git a/net-wireless/adm8211/ChangeLog b/net-wireless/adm8211/ChangeLog
index e961bf0e39d7..3b3465ca8c79 100644
--- a/net-wireless/adm8211/ChangeLog
+++ b/net-wireless/adm8211/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/adm8211
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/adm8211/ChangeLog,v 1.8 2007/07/23 19:53:29 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/adm8211/ChangeLog,v 1.9 2007/08/14 20:42:40 genstef Exp $
+
+  14 Aug 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch,
+  adm8211-20060111.ebuild:
+  Add 2.6.22 patch thanks to Mariusz Czubacki <mariusz.czubacki@gmail.com>
 
 *adm8211-20060111 (23 Jul 2007)
 
diff --git a/net-wireless/adm8211/Manifest b/net-wireless/adm8211/Manifest
index 90eaf3dc7d4d..cec8c0da7e54 100644
--- a/net-wireless/adm8211/Manifest
+++ b/net-wireless/adm8211/Manifest
@@ -18,6 +18,10 @@ AUX 05-update-email-address-from-jkmaline-cc.hut.fi-to.patch 3092 RMD160 57bff4c
 MD5 8a5410c869d88e539a69f8ff035d2835 files/05-update-email-address-from-jkmaline-cc.hut.fi-to.patch 3092
 RMD160 57bff4c5f1cf069d56a0ce6d247d4c1d22246fee files/05-update-email-address-from-jkmaline-cc.hut.fi-to.patch 3092
 SHA256 504d30dfa0b64e7b2789c5c329ada4c70b6110329e45ccc911b694528e1a6873 files/05-update-email-address-from-jkmaline-cc.hut.fi-to.patch 3092
+AUX 06-adm8211-fix-build-breakage-from-skb-mac.raw.patch 1574 RMD160 e03b5146371ca166ceace7a731396310efe8c5af SHA1 5db51c6a0c5108fa498ed5f690b56830d2e9b061 SHA256 b55bbc8222554eb2e76fbd09df5bc42e389ae5a6ce104eea30f5ad53cde0f417
+MD5 8df9587e5ab9a9262301dfe9e0c1586c files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch 1574
+RMD160 e03b5146371ca166ceace7a731396310efe8c5af files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch 1574
+SHA256 b55bbc8222554eb2e76fbd09df5bc42e389ae5a6ce104eea30f5ad53cde0f417 files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch 1574
 AUX 2.6.20-no-config_h.patch 522 RMD160 0adada37839914557fc5c0610638a9a47b87888b SHA1 ad904091835d968b195d429aedb9e5c8b2b2e975 SHA256 69cd05081cc875364bbdb3215317bfa78d1be155850023d70779256c66f6e031
 MD5 0f5a73301c26c0bb5105e32af4678922 files/2.6.20-no-config_h.patch 522
 RMD160 0adada37839914557fc5c0610638a9a47b87888b files/2.6.20-no-config_h.patch 522
@@ -40,14 +44,14 @@ EBUILD adm8211-20050620.ebuild 1321 RMD160 7c28fe552e65a87ca0226f3f543a498b00277
 MD5 15cc31c42b10ff8dbc640798c1b60902 adm8211-20050620.ebuild 1321
 RMD160 7c28fe552e65a87ca0226f3f543a498b002773cd adm8211-20050620.ebuild 1321
 SHA256 7bbfb2fa86e85adeb56737ae038cc6d9027219397aab26994182e5d33de3ac8d adm8211-20050620.ebuild 1321
-EBUILD adm8211-20060111.ebuild 1357 RMD160 13aba07d1cbcd3491f0bed6ec65016217f19e01d SHA1 e61e5e71ac72335528d1a12b96d9b762374b8eb6 SHA256 1adcbc504735687cc4ef1bce0ac7e652526cc47d9f2cffb94d14c4a1a7c391f3
-MD5 3b4b85c06b2e060cb0987b827e06d4b3 adm8211-20060111.ebuild 1357
-RMD160 13aba07d1cbcd3491f0bed6ec65016217f19e01d adm8211-20060111.ebuild 1357
-SHA256 1adcbc504735687cc4ef1bce0ac7e652526cc47d9f2cffb94d14c4a1a7c391f3 adm8211-20060111.ebuild 1357
-MISC ChangeLog 1552 RMD160 03e9ace56ff554cd4801451677c07bd7a3a1463b SHA1 e9f77c5af811f9f76776f8bc617d00602ecd7630 SHA256 9610b7f0e2e397898775504ebb73ff7c7dfa139405c16328675f7eb4f0d369e7
-MD5 add0358bcf7ea141fa6535f4ca13ffe7 ChangeLog 1552
-RMD160 03e9ace56ff554cd4801451677c07bd7a3a1463b ChangeLog 1552
-SHA256 9610b7f0e2e397898775504ebb73ff7c7dfa139405c16328675f7eb4f0d369e7 ChangeLog 1552
+EBUILD adm8211-20060111.ebuild 1453 RMD160 83c9ebb260e2934e7c38857071827a7a64af18d2 SHA1 aadb9f7b2e0f4cbe43f0101f9395f818aae1e42e SHA256 3ce08e241391862b6104644fc8512f5759b576048e138a2e5076ca5b15e779c2
+MD5 f10d4a2c95aad4b5a81eec777cc23450 adm8211-20060111.ebuild 1453
+RMD160 83c9ebb260e2934e7c38857071827a7a64af18d2 adm8211-20060111.ebuild 1453
+SHA256 3ce08e241391862b6104644fc8512f5759b576048e138a2e5076ca5b15e779c2 adm8211-20060111.ebuild 1453
+MISC ChangeLog 1771 RMD160 047c71a6176ad6ff2f9fe63b509eb8a3f6e491fc SHA1 f7e361c740ad6e9e3da2cfa64b8ba40dbca624c7 SHA256 5930c79d2ff52e06e15210bb78c8a3c53bb19e2f509515a0a86c5718ed8c0931
+MD5 9da17e8e9f1e4ea1bcd3ef5484a4c47e ChangeLog 1771
+RMD160 047c71a6176ad6ff2f9fe63b509eb8a3f6e491fc ChangeLog 1771
+SHA256 5930c79d2ff52e06e15210bb78c8a3c53bb19e2f509515a0a86c5718ed8c0931 ChangeLog 1771
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
diff --git a/net-wireless/adm8211/adm8211-20060111.ebuild b/net-wireless/adm8211/adm8211-20060111.ebuild
index 452149c175b4..ad601194a14a 100644
--- a/net-wireless/adm8211/adm8211-20060111.ebuild
+++ b/net-wireless/adm8211/adm8211-20060111.ebuild
@@ -44,6 +44,7 @@ src_unpack() {
 	epatch ${FILESDIR}/03-fix-work_struct-build-breakage.patch
 	epatch ${FILESDIR}/04-fix-set-essid-for-WE-21.patch
 	epatch ${FILESDIR}/05-update-email-address-from-jkmaline-cc.hut.fi-to.patch
+	kernel_is ge 2 6 22 && epatch ${FILESDIR}/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch
 
 	convert_to_m ${S}/Makefile
 }
diff --git a/net-wireless/adm8211/files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch b/net-wireless/adm8211/files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch
new file mode 100644
index 000000000000..d3bb15d60cca
--- /dev/null
+++ b/net-wireless/adm8211/files/06-adm8211-fix-build-breakage-from-skb-mac.raw.patch
@@ -0,0 +1,53 @@
+>From 72c942ed694ef6249c0df84c0802e7378884e7c7 Mon Sep 17 00:00:00 2001
+From: John W. Linville <linville@tuxdriver.com>
+Date: Tue, 29 May 2007 14:21:23 -0400
+Subject: [PATCH] [PATCH] adm8211: fix build breakage from skb->mac.raw
+
+Use skb_mac_header and related functions instead.
+
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+---
+ drivers/net/wireless/adm8211/adm8211_hw.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/adm8211/adm8211_hw.c b/adm8211/adm8211_hw.c
+index 2ec950d..49d79cb 100644
+--- a/adm8211/adm8211_hw.c
++++ b/adm8211/adm8211_hw.c
+@@ -499,7 +499,7 @@ static void adm8211_rx_skb(struct net_device *dev, struct sk_buff *skb)
+ 		ieee->stats.rx_packets++;
+ 
+ 		skb->pkt_type = PACKET_OTHERHOST;
+-		skb->mac.raw = skb->data;
++		skb_reset_mac_header(skb);
+ 
+ 		netif_rx(skb);
+ 		dev->last_rx = jiffies;
+@@ -717,7 +717,7 @@ static void adm8211_interrupt_rci(struct net_device *dev)
+ #endif
+ 			stat->rssi = rssi;
+ 			stat->rate = rate;
+-			skb->mac.raw = skb->data;
++			skb_reset_mac_header(skb);
+ 			skb->protocol = __constant_htons(ETH_P_802_2);
+ 			skb_queue_tail(&priv->rx_queue, skb);
+ 			tasklet_schedule(&priv->rx_tasklet);
+@@ -2376,7 +2376,8 @@ static int adm8211_hard_start_xmit(struct ieee80211_txb *txb,
+ 
+ int adm8211_80211_header_parse(struct sk_buff *skb, unsigned char *haddr)
+ {
+-	memcpy(haddr, skb->mac.raw + 10 + sizeof(struct avs_caphdr), ETH_ALEN); /* addr2 */
++	memcpy(haddr, skb_mac_header(skb) + 10 + sizeof(struct avs_caphdr),
++		ETH_ALEN); /* addr2 */
+ 	return ETH_ALEN;
+ }
+ 
+-- 
+1.5.2.1
+
+
+
+
+
+
+