Bug#381528: madwifi does not build with 2.6.18-rc3

[Junichi Uekawa]

Package: madwifi-source
Version: 0.svnr1680.0.9.1-1
Tags: patch

Please fix build issue with latest kernels.


diff -u madwifi-0.svnr1680.0.9.1/debian/changelog madwifi-0.svnr1680.0.9.1/debian/changelog
--- madwifi-0.svnr1680.0.9.1/debian/changelog
+++ madwifi-0.svnr1680.0.9.1/debian/changelog
@@ -1,3 +1,9 @@
+madwifi (0.svnr1680.0.9.1-1.1) unstable; urgency=low
+
+  * Apply fixes for madwifi tickets 746, 760 to build with 2.6.18-rc3
+
+ -- Junichi Uekawa <dancer at debian.org>  Sat,  5 Aug 2006 15:49:02 +0900
+
 madwifi (0.svnr1680.0.9.1-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- madwifi-0.svnr1680.0.9.1.orig/net80211/ieee80211_linux.c
+++ madwifi-0.svnr1680.0.9.1/net80211/ieee80211_linux.c
@@ -44,6 +44,7 @@
 #include <linux/etherdevice.h>
 #include <linux/if_vlan.h>
 #include <linux/vmalloc.h>
+#include <linux/proc_fs.h>
 
 #include <net/iw_handler.h>
 #include <linux/wireless.h>
only in patch2:
unchanged:
--- madwifi-0.svnr1680.0.9.1.orig/include/compat.h
+++ madwifi-0.svnr1680.0.9.1/include/compat.h
@@ -43,7 +43,11 @@
  */
 #define	NBBY	8			/* number of bits/byte */
 
-#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */ 
+#endif
+
 #define	howmany(x, y)	(((x)+((y)-1))/(y))
 
 /* Bit map related macros. */