Add 2.6.22 patch

(Portage version: 2.1.2.7)

3 files changed, 92 insertions, 4 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 7e8dc456446e..6174dd01ff15 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.34 2007/04/16 19:37:23 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.35 2007/05/13 14:49:12 genstef Exp $
+
+  13 May 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/madwifi-2.6.22.patch, madwifi-ng-0.9.3-r3.ebuild:
+  Add 2.6.22 patch
 
 *madwifi-ng-0.9.3-r3 (16 Apr 2007)
 
diff --git a/net-wireless/madwifi-ng/files/madwifi-2.6.22.patch b/net-wireless/madwifi-ng/files/madwifi-2.6.22.patch
new file mode 100644
index 000000000000..58cc57cd1985
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-2.6.22.patch
@@ -0,0 +1,82 @@
+diff -ur madwifi-0.9.3.orig/ath/if_ath_pci.c madwifi-0.9.3/ath/if_ath_pci.c
+--- madwifi-0.9.3.orig/ath/if_ath_pci.c	2007-01-22 04:07:30.000000000 +0100
++++ madwifi-0.9.3/ath/if_ath_pci.c	2007-05-13 16:12:59.000000000 +0200
+@@ -207,7 +207,7 @@
+ 
+ 	pci_set_drvdata(pdev, dev);
+ 
+-	if (request_irq(dev->irq, ath_intr, SA_SHIRQ, dev->name, dev)) {
++	if (request_irq(dev->irq, ath_intr, IRQF_SHARED, dev->name, dev)) {
+ 		printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
+ 		goto bad3;
+ 	}
+diff -ur madwifi-0.9.3.orig/net80211/ieee80211_input.c madwifi-0.9.3/net80211/ieee80211_input.c
+--- madwifi-0.9.3.orig/net80211/ieee80211_input.c	2007-02-02 21:01:51.000000000 +0100
++++ madwifi-0.9.3/net80211/ieee80211_input.c	2007-05-13 16:17:28.000000000 +0200
+@@ -1127,8 +1127,8 @@
+ 		}
+ 		if (skb1 != NULL) {
+ 			skb1->dev = dev;
+-			skb1->mac.raw = skb1->data;
+-			skb1->nh.raw = skb1->data + sizeof(struct ether_header);
++			skb1->mac_header = skb1->data;
++			skb1->network_header = skb1->data + sizeof(struct ether_header);
+ 			skb1->protocol = __constant_htons(ETH_P_802_2);
+ 			/* XXX insert vlan tag before queue it? */
+ 			dev_queue_xmit(skb1);
+@@ -2250,7 +2250,7 @@
+ 		if (skb1 == NULL)
+ 			return;
+ 		skb1->dev = dev;
+-		skb1->mac.raw = skb1->data;
++		skb1->mac_header = skb1->data;
+ 		skb1->ip_summed = CHECKSUM_NONE;
+ 		skb1->pkt_type = PACKET_OTHERHOST;
+ 		skb1->protocol = __constant_htons(0x0019);  /* ETH_P_80211_RAW */
+@@ -2525,7 +2525,7 @@
+ 	
+ 	skb->dev = dev;
+ 	skb->protocol = eth_type_trans(skb, dev);
+-	skb->mac.raw = skb->data;
++	skb->mac_header = skb->data;
+ 	ieee80211_deliver_data(ni, skb);
+ 	return;
+ }
+@@ -3691,14 +3691,14 @@
+ {
+ 	struct ethhdr *eth;
+ 	
+-	skb->mac.raw=skb->data;
++	skb->mac_header=skb->data;
+ 	skb_pull(skb, ETH_HLEN);
+ 	/*
+ 	 * NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but
+ 	 *     since that's an inline and not a define there's
+ 	 *     no easy way to do this cleanly.
+ 	 */
+-	eth = (struct ethhdr *)skb->mac.raw;
++	eth = (struct ethhdr *)skb->mac_header;
+ 	
+ 	if (*eth->h_dest & 1)
+ 		if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)
+diff -ur madwifi-0.9.3.orig/net80211/ieee80211_monitor.c madwifi-0.9.3/net80211/ieee80211_monitor.c
+--- madwifi-0.9.3.orig/net80211/ieee80211_monitor.c	2007-02-15 00:45:48.000000000 +0100
++++ madwifi-0.9.3/net80211/ieee80211_monitor.c	2007-05-13 16:18:25.000000000 +0200
+@@ -373,7 +373,7 @@
+ 		if (vap->iv_monitor_txf_len && tx) {
+ 			/* truncate transmit feedback packets */
+ 			skb_trim(skb1, vap->iv_monitor_txf_len);
+-			skb1->nh.raw = skb1->data;
++			skb1->network_header = skb1->data;
+ 		}
+ 		switch (vap->iv_dev->type) {
+ 		case ARPHRD_IEEE80211:
+@@ -555,7 +555,7 @@
+ 				skb_trim(skb1, skb1->len - IEEE80211_CRC_LEN);
+ 			}
+ 			skb1->dev = dev; /* NB: deliver to wlanX */
+-			skb1->mac.raw = skb1->data;
++			skb1->mac_header = skb1->data;
+ 			skb1->ip_summed = CHECKSUM_NONE;
+ 			skb1->pkt_type = pkttype;
+ 			skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild
index 399fe6807be8..3f93498a6273 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild,v 1.1 2007/04/16 19:37:23 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild,v 1.2 2007/05/13 14:49:12 genstef Exp $
 
 inherit linux-mod
 
@@ -22,9 +22,9 @@ RDEPEND="!net-wireless/madwifi-old
 		net-wireless/wireless-tools
 		~net-wireless/madwifi-ng-tools-${PV:0:5}"
 
-CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL"
+CONFIG_CHECK="CRYPTO WIRELESS_EXT SYSCTL"
 ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_NET_RADIO="${P} requires CONFIG_WIRELESS_EXT selected by Wireless LAN drivers (non-hamradio) & Wireless Extensions"
 ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
 BUILD_TARGETS="all"
 MODULESD_ATH_PCI_DOCS="README"
@@ -58,6 +58,8 @@ src_unpack() {
 	for dir in ath ath_hal net80211 ath_rate ath_rate/amrr ath_rate/onoe ath_rate/sample; do
 		convert_to_m ${S}/${dir}/Makefile
 	done
+
+	kernel_is ge 2 6 22 && epatch ${FILESDIR}/madwifi-2.6.22.patch
 }
 
 src_install() {