From 4b4d2c7b245093118e50aab40b998368364a294f Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Tue, 27 Jan 2009 22:30:19 -0800 Subject: [PATCH] --- yaml --- r: 130481 b: refs/heads/master c: 6c06a478c9e59d1584a5dc1b2b3519bae5d6546a h: refs/heads/master i: 130479: 51ff7a60e866646a7d5efb03ccd83b322365a97b v: v3 --- [refs] | 2 +- trunk/net/ipv6/icmp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 13bbfbfdb920..16b1e7777c4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94cd3e6cbebf85903b4d53ed2147bdb4c6e08625 +refs/heads/master: 6c06a478c9e59d1584a5dc1b2b3519bae5d6546a diff --git a/trunk/net/ipv6/icmp.c b/trunk/net/ipv6/icmp.c index 4f433847d95f..36dff8807183 100644 --- a/trunk/net/ipv6/icmp.c +++ b/trunk/net/ipv6/icmp.c @@ -443,10 +443,10 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info, if (xfrm_decode_session_reverse(skb, &fl2, AF_INET6)) goto relookup_failed; - if (ip6_dst_lookup(sk, &dst2, &fl)) + if (ip6_dst_lookup(sk, &dst2, &fl2)) goto relookup_failed; - err = xfrm_lookup(net, &dst2, &fl, sk, XFRM_LOOKUP_ICMP); + err = xfrm_lookup(net, &dst2, &fl2, sk, XFRM_LOOKUP_ICMP); switch (err) { case 0: dst_release(dst);