diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 01:35:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 01:35:23 -0400 |
| commit | e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (patch) | |
| tree | 4e1ca325dde22f1ac21c9da0be509e87e922e604 /net/ipv6/icmp.c | |
| parent | c0f39322c335412339dec16ebfd2a05ceba5ebcf (diff) | |
| parent | 802fb176d8c635ae42da31b80841c26e8c7338a0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/s2io.c
Diffstat (limited to 'net/ipv6/icmp.c')
| -rw-r--r-- | net/ipv6/icmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 63309d10df3a..227ce3d2339d 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
| @@ -440,10 +440,10 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info, | |||
| 440 | } | 440 | } |
| 441 | 441 | ||
| 442 | if (xfrm_decode_session_reverse(skb, &fl2, AF_INET6)) | 442 | if (xfrm_decode_session_reverse(skb, &fl2, AF_INET6)) |
| 443 | goto out; | 443 | goto out_dst_release; |
| 444 | 444 | ||
| 445 | if (ip6_dst_lookup(sk, &dst2, &fl)) | 445 | if (ip6_dst_lookup(sk, &dst2, &fl)) |
| 446 | goto out; | 446 | goto out_dst_release; |
| 447 | 447 | ||
| 448 | err = xfrm_lookup(&dst2, &fl, sk, XFRM_LOOKUP_ICMP); | 448 | err = xfrm_lookup(&dst2, &fl, sk, XFRM_LOOKUP_ICMP); |
| 449 | if (err == -ENOENT) { | 449 | if (err == -ENOENT) { |