diff -r 18adcc36d6c7 -r 52b95297ffde  include/kincludes.h
--- a/include/kincludes.h	Sat Jan 19 17:15:32 2008 +0000
+++ b/include/kincludes.h	Sat Jan 19 17:15:57 2008 +0000
@@ -12,7 +12,7 @@
  */
 #include <linux/types.h>
 #include <linux/version.h>
-#include <linux/config.h>
+#include <linux/autoconf.h>
 /* #include <net/checksum.h> */
 
 #ifndef KERNEL_VERSION
diff -r 18adcc36d6c7 -r 52b95297ffde kernel/knistnet.c
--- a/kernel/knistnet.c	Sat Jan 19 17:15:32 2008 +0000
+++ b/kernel/knistnet.c	Sat Jan 19 17:15:57 2008 +0000
@@ -913,7 +913,7 @@ rcv_packet_munge(struct sk_buff *skb, st
 		if (!tableme) {	/* not intercepting */
 			global_stats(STATS_UNPROCESS);
 			LinUnlock("global_stats2");
-			return ippt->func(skb, dev, ippt);
+			return ippt->func(skb, dev, ippt, dev);
 		}
 
 		/* Assume we will queue until we find otherwise */
@@ -958,7 +958,7 @@ rcv_packet_munge(struct sk_buff *skb, st
 
 			global_stats(STATS_PROCESS);
 			munge_finish("no delay");
-			return ippt->func(skb, dev, ippt);
+			return ippt->func(skb, dev, ippt, dev);
 		}
 
 		screamer = fast_alloc(GFP_ATOMIC);
@@ -969,7 +969,7 @@ rcv_packet_munge(struct sk_buff *skb, st
 			packet_stats(skb, hitme);
 			global_stats(STATS_PROCESS);
 			munge_finish("fast_alloc failed");
-			return ippt->func(skb, dev, ippt);
+			return ippt->func(skb, dev, ippt, dev);
 		}
 		hpi = (struct nistnet_packetinfo *)screamer->data;
 
@@ -1000,7 +1000,7 @@ rcv_packet_munge(struct sk_buff *skb, st
 		return 0;
 	} else {
 		LinUnlock("ippt->func");
-		return ippt->func(skb, dev, ippt);
+		return ippt->func(skb, dev, ippt, dev);
 	}
 }
 
diff -r 18adcc36d6c7 -r 52b95297ffde kernel/nistnet_table.c
--- a/kernel/nistnet_table.c	Sat Jan 19 17:15:32 2008 +0000
+++ b/kernel/nistnet_table.c	Sat Jan 19 17:15:57 2008 +0000
@@ -27,7 +27,7 @@
 #ifndef TRUE
 #define TRUE	1
 #define FALSE	0
-typedef enum {false = FALSE, true = TRUE} boolean;
+
 #endif
 
 /* OK, as defined, each table entry+pointers amounts to 56 bytes (14 words).