diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-03 22:53:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-03 22:53:31 -0500 |
| commit | 78a8a36fe0b2cee5a0a7360107815cbcad5b4003 (patch) | |
| tree | 1abf45fa898ed4e31a131328b0e182f29a72300a /net/ipv6/ip6_input.c | |
| parent | 04a6f4417bfd17c3860e8fb37387cb78265ffe44 (diff) | |
| parent | ccb1352e76cff0524e7ccb2074826a092dd13016 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Diffstat (limited to 'net/ipv6/ip6_input.c')
| -rw-r--r-- | net/ipv6/ip6_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index a46c64eb0a6..1ca5d45a12e 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -280,6 +280,7 @@ int ip6_mc_input(struct sk_buff *skb) u8 *ptr = skb_network_header(skb) + opt->ra; struct icmp6hdr *icmp6; u8 nexthdr = hdr->nexthdr; + __be16 frag_off; int offset; /* Check if the value of Router Alert @@ -293,7 +294,7 @@ int ip6_mc_input(struct sk_buff *skb) goto out; } offset = ipv6_skip_exthdr(skb, sizeof(*hdr), - &nexthdr); + &nexthdr, &frag_off); if (offset < 0) goto out; |