[PATCH] ip6t_REJECT.c vs 2.6.12.

[PATCH] ip6t_REJECT.c vs 2.6.12.

[Pawel Sikora]

[-- Attachment #1: Type: text/plain, Size: 385 bytes --]

Hi,

In 2.6.12 the net/ipv6.h was changed.

(...)
extern int ipv6_skip_exthdr(const struct sk_buff *, int start,
-                           u8 *nexthdrp, int len);
+                           u8 *nexthdrp);

ip6t_REJECT.c needs minor fix.

-- 
The only thing necessary for the triumph of evil
  is for good men to do nothing.
                                           - Edmund Burke

[-- Attachment #2: 0.diff --]
[-- Type: text/x-diff, Size: 530 bytes --]

Index: ip6t_REJECT.c
===================================================================
--- ip6t_REJECT.c	(revision 3984)
+++ ip6t_REJECT.c	(working copy)
@@ -72,9 +72,7 @@
 	}
 
 	proto = oip6h->nexthdr;
-	tcphoff = ipv6_skip_exthdr(oldskb, ((u8*)(oip6h+1) - oldskb->data),
-				   &proto, oldskb->len - ((u8*)(oip6h+1)
-							  - oldskb->data));
+	tcphoff = ipv6_skip_exthdr(oldskb, (u8*)(oip6h+1) - oldskb->data, &proto);
 
 	if ((tcphoff < 0) || (tcphoff > oldskb->len)) {
 		DEBUGP("ip6t_REJECT: Can't get TCP header.\n");

Re: [PATCH] ip6t_REJECT.c vs 2.6.12.

[Patrick McHardy]

Pawel Sikora wrote:
> Hi,
> 
> In 2.6.12 the net/ipv6.h was changed.
> 
> (...)
> extern int ipv6_skip_exthdr(const struct sk_buff *, int start,
> -                           u8 *nexthdrp, int len);
> +                           u8 *nexthdrp);
> 
> ip6t_REJECT.c needs minor fix.

I already have a fixed version queued and will submit it with my
next batch of patches.

Regards
Patrick