Merge tag 'kvm-3.6-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[firefly-linux-kernel-4.4.55.git] / net / ipv6 / esp6.c

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 89a615ba84f8825014a107486387abd5dc8cebb7..6dc7fd353ef53f9c08c9202340fc953bf3b294c5 100644 (file)
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -434,16 +434,19 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        struct xfrm_state *x;
 
        if (type != ICMPV6_DEST_UNREACH &&
-           type != ICMPV6_PKT_TOOBIG)
+           type != ICMPV6_PKT_TOOBIG &&
+           type != NDISC_REDIRECT)
                return;
 
        x = xfrm_state_lookup(net, skb->mark, (const xfrm_address_t *)&iph->daddr,
                              esph->spi, IPPROTO_ESP, AF_INET6);
        if (!x)
                return;
-       pr_debug("pmtu discovery on SA ESP/%08x/%pI6\n",
-                ntohl(esph->spi), &iph->daddr);
-       ip6_update_pmtu(skb, net, info, 0, 0);
+
+       if (type == NDISC_REDIRECT)
+               ip6_redirect(skb, net, 0, 0);
+       else
+               ip6_update_pmtu(skb, net, info, 0, 0);
        xfrm_state_put(x);
 }