Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / net / netfilter / xt_TCPOPTSTRIP.c

diff --git a/net/netfilter/xt_TCPOPTSTRIP.c b/net/netfilter/xt_TCPOPTSTRIP.c
index 3b2aa56833b9072d7e107d55796d62dae53935fe..9685b6fcbc81b60fb01a5cd7d8a3c6ac5e368024 100644 (file)
--- a/net/netfilter/xt_TCPOPTSTRIP.c
+++ b/net/netfilter/xt_TCPOPTSTRIP.c
@@ -90,7 +90,7 @@ tcpoptstrip_tg6(struct sk_buff *skb, const struct net_device *in,
                const struct xt_target *target, const void *targinfo)
 {
        struct ipv6hdr *ipv6h = ipv6_hdr(skb);
-       unsigned int tcphoff;
+       int tcphoff;
        u_int8_t nexthdr;
 
        nexthdr = ipv6h->nexthdr;