r283 - in /unstable/madwifi/debian: changelog patches/10_compat-0.9.3-2.6.22.dpatch

Sun Jul 15 08:28:13 UTC 2007

Author: kelmo-guest
Date: Sun Jul 15 08:28:11 2007
New Revision: 283

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=283
Log:
* Update debian/patches/10_compat-0.9.3-2.6.22.dpatch to also allow
  successful build on 2.6.22 if patched into kernel tree.

Modified:
    unstable/madwifi/debian/changelog
    unstable/madwifi/debian/patches/10_compat-0.9.3-2.6.22.dpatch

Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=283&op=diff
==============================================================================

--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Sun Jul 15 08:28:11 2007
@@ -2,8 +2,10 @@
 
   * Fix compilation on mips32, thanks Aurelien. (Closes: #433158)
     [debian/patches/11_mips-compile-flags-fix.dpatch]
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 15 Jul 2007 10:54:37 +1000
+  * Update debian/patches/10_compat-0.9.3-2.6.22.dpatch to also allow
+    successful build on 2.6.22 if patched into kernel tree.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 15 Jul 2007 18:27:27 +1000
 
 madwifi (1:0.9.3-3) unstable; urgency=low
 

Modified: unstable/madwifi/debian/patches/10_compat-0.9.3-2.6.22.dpatch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/10_compat-0.9.3-2.6.22.dpatch?rev=283&op=diff
==============================================================================
--- unstable/madwifi/debian/patches/10_compat-0.9.3-2.6.22.dpatch (original)
+++ unstable/madwifi/debian/patches/10_compat-0.9.3-2.6.22.dpatch Sun Jul 15 08:28:11 2007
@@ -6,9 +6,9 @@
 ## DP: http://madwifi.org/changeset/2339
 
 @DPATCH@
-diff -Nrup madwifi-0.9.3/ath/if_ath_pci.c madwifi-0.9.3-2.6.22/ath/if_ath_pci.c
+diff -Nrup madwifi-0.9.3/ath/if_ath_pci.c madwifi-0.9.3-patch/ath/if_ath_pci.c
 --- madwifi-0.9.3/ath/if_ath_pci.c	2007-01-22 13:07:30.000000000 +1000
-+++ madwifi-0.9.3-2.6.22/ath/if_ath_pci.c	2007-07-11 15:25:50.000000000 +1000
++++ madwifi-0.9.3-patch/ath/if_ath_pci.c	2007-07-15 18:25:52.000000000 +1000
 @@ -207,7 +207,11 @@ ath_pci_probe(struct pci_dev *pdev, cons
  
  	pci_set_drvdata(pdev, dev);
@@ -21,9 +21,9 @@
  		printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
  		goto bad3;
  	}
-diff -Nrup madwifi-0.9.3/include/compat.h madwifi-0.9.3-2.6.22/include/compat.h
+diff -Nrup madwifi-0.9.3/include/compat.h madwifi-0.9.3-patch/include/compat.h
 --- madwifi-0.9.3/include/compat.h	2007-03-03 03:42:33.000000000 +1000
-+++ madwifi-0.9.3-2.6.22/include/compat.h	2007-07-11 15:04:00.000000000 +1000
++++ madwifi-0.9.3-patch/include/compat.h	2007-07-15 18:25:52.000000000 +1000
 @@ -130,6 +130,39 @@
  #define __iomem
  #endif
@@ -64,9 +64,9 @@
  #endif /* __KERNEL__ */
  
  #endif /* _ATH_COMPAT_H_ */
-diff -Nrup madwifi-0.9.3/net80211/ieee80211_input.c madwifi-0.9.3-2.6.22/net80211/ieee80211_input.c
+diff -Nrup madwifi-0.9.3/net80211/ieee80211_input.c madwifi-0.9.3-patch/net80211/ieee80211_input.c
 --- madwifi-0.9.3/net80211/ieee80211_input.c	2007-02-03 06:01:51.000000000 +1000
-+++ madwifi-0.9.3-2.6.22/net80211/ieee80211_input.c	2007-07-11 15:12:53.000000000 +1000
++++ madwifi-0.9.3-patch/net80211/ieee80211_input.c	2007-07-15 18:25:52.000000000 +1000
 @@ -1039,11 +1039,12 @@ ieee80211_defrag(struct ieee80211_node *
  			 * incoming fragments
  			 * XXX 4-address/QoS frames?
@@ -142,9 +142,9 @@
  	
  	if (*eth->h_dest & 1)
  		if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)
-diff -Nrup madwifi-0.9.3/net80211/ieee80211_monitor.c madwifi-0.9.3-2.6.22/net80211/ieee80211_monitor.c
+diff -Nrup madwifi-0.9.3/net80211/ieee80211_monitor.c madwifi-0.9.3-patch/net80211/ieee80211_monitor.c
 --- madwifi-0.9.3/net80211/ieee80211_monitor.c	2007-02-15 09:45:48.000000000 +1000
-+++ madwifi-0.9.3-2.6.22/net80211/ieee80211_monitor.c	2007-07-11 15:15:52.000000000 +1000
++++ madwifi-0.9.3-patch/net80211/ieee80211_monitor.c	2007-07-15 18:25:52.000000000 +1000
 @@ -373,7 +373,7 @@ ieee80211_input_monitor(struct ieee80211
  		if (vap->iv_monitor_txf_len && tx) {
  			/* truncate transmit feedback packets */
@@ -164,3 +164,15 @@
  			skb1->ip_summed = CHECKSUM_NONE;
  			skb1->pkt_type = pkttype;
  			skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */
+diff -Nrup madwifi-0.9.3/patches/2.6/Kconfig madwifi-0.9.3-patch/patches/2.6/Kconfig
+--- madwifi-0.9.3/patches/2.6/Kconfig	2007-01-19 05:59:57.000000000 +1000
++++ madwifi-0.9.3-patch/patches/2.6/Kconfig	2007-07-15 18:24:37.000000000 +1000
+@@ -3,7 +3,7 @@ comment "Atheros 802.11(a/b/g) PCI/Cardb
+ 
+ config ATHEROS
+ 	tristate "Atheros PCI/Cardbus cards"
+-	depends on PCI && NET_RADIO
++	depends on PCI && (NET_RADIO || WIRELESS_EXT)
+        ---help---
+ 	  Say Y here if you intend to attach an Atheros Cardbus or PCI
+ 	  wireless Ethernet networking card to your computer.  This


