Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / net / ipv6 / netfilter / ip6t_hl.c

diff --git a/net/ipv6/netfilter/ip6t_hl.c b/net/ipv6/netfilter/ip6t_hl.c
index 601cc12..d606c0e 100644 (file)
--- a/net/ipv6/netfilter/ip6t_hl.c
+++ b/net/ipv6/netfilter/ip6t_hl.c
@@ -25,7 +25,7 @@ static int match(const struct sk_buff *skb,
                 int offset, unsigned int protoff, int *hotdrop)
 {
        const struct ip6t_hl_info *info = matchinfo;
-       const struct ipv6hdr *ip6h = skb->nh.ipv6h;
+       const struct ipv6hdr *ip6h = ipv6_hdr(skb);
 
        switch (info->mode) {
                case IP6T_HL_EQ:
@@ -41,7 +41,7 @@ static int match(const struct sk_buff *skb,
                        return (ip6h->hop_limit > info->hop_limit);
                        break;
                default:
-                       printk(KERN_WARNING "ip6t_hl: unknown mode %d\n", 
+                       printk(KERN_WARNING "ip6t_hl: unknown mode %d\n",
                                info->mode);
                        return 0;
        }