[POM-NG 5/10] Fix the ipv4options extension for 2.6.16 kernels

[Krzysztof Oledzki]

[POM-NG 5/10] Fix the ipv4options extension for 2.6.16 kernels

This patch allows the ipv4options extension to be used with 2.6.16 kernels

Signed-off-by: Krzysztof Piotr Oledzki <ole at ans.pl>

diff -Nur patch-o-matic-ng-20060311-orig/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c patch-o-matic-ng-20060311/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c
--- patch-o-matic-ng-20060311-orig/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c	2005-11-16 11:52:50.000000000 +0100
+++ patch-o-matic-ng-20060311/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c	2006-03-21 23:49:43.000000000 +0100
@@ -27,6 +27,7 @@
        const struct net_device *out,
        const void *matchinfo,
        int offset,
+      unsigned int protoff,
        int *hotdrop)
  {
  	const struct ipt_ipv4options_info *info = matchinfo;   /* match info for rule */
@@ -105,7 +106,7 @@

  static int
  checkentry(const char *tablename,
-	   const struct ipt_ip *ip,
+	   const void *ip,
  	   void *matchinfo,
  	   unsigned int matchsize,
  	   unsigned int hook_mask)
-------------- next part --------------
[POM-NG 5/10] Fix the ipv4options extension for 2.6.16 kernels

This patch allows the ipv4options extension to be used with 2.6.16 kernels

Signed-off-by: Krzysztof Piotr Oledzki <ole at ans.pl>

diff -Nur patch-o-matic-ng-20060311-orig/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c patch-o-matic-ng-20060311/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c
--- patch-o-matic-ng-20060311-orig/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c	2005-11-16 11:52:50.000000000 +0100
+++ patch-o-matic-ng-20060311/patchlets/ipv4options/linux-2.6/net/ipv4/netfilter/ipt_ipv4options.c	2006-03-21 23:49:43.000000000 +0100
@@ -27,6 +27,7 @@
       const struct net_device *out,
       const void *matchinfo,
       int offset,
+      unsigned int protoff,
       int *hotdrop)
 {
 	const struct ipt_ipv4options_info *info = matchinfo;   /* match info for rule */
@@ -105,7 +106,7 @@
 
 static int
 checkentry(const char *tablename,
-	   const struct ipt_ip *ip,
+	   const void *ip,
 	   void *matchinfo,
 	   unsigned int matchsize,
 	   unsigned int hook_mask)