public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed

From: Duan Jiong <duanj.fnst@cn•fujitsu.com>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, hannes@stressinduktion•org
Subject: [PATCH 07/11] ipv6: move route updating for redirect to ndisc layer
Date: Thu, 12 Sep 2013 18:49:59 +0800	[thread overview]
Message-ID: <52319C57.5030402@cn.fujitsu.com> (raw)
In-Reply-To: <52319A6E.6090503@cn.fujitsu.com>

From: Duan Jiong <duanj.fnst@cn•fujitsu.com>

So the ipcomm6_err() only handle the ICMPV6_PKT_TOOBIG.

Signed-off-by: Duan Jiong <duanj.fnst@cn•fujitsu.com>
---
 net/ipv6/ipcomp6.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 5636a91..e943158 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -64,9 +64,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 		(struct ip_comp_hdr *)(skb->data + offset);
 	struct xfrm_state *x;
 
-	if (type != ICMPV6_DEST_UNREACH &&
-	    type != ICMPV6_PKT_TOOBIG &&
-	    type != NDISC_REDIRECT)
+	if (type != ICMPV6_PKT_TOOBIG)
 		return;
 
 	spi = htonl(ntohs(ipcomph->cpi));
@@ -75,10 +73,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 	if (!x)
 		return;
 
-	if (type == NDISC_REDIRECT)
-		ip6_redirect(skb, net, skb->dev->ifindex, 0);
-	else
-		ip6_update_pmtu(skb, net, info, 0, 0);
+	ip6_update_pmtu(skb, net, info, 0, 0);
 	xfrm_state_put(x);
 }
 
-- 
1.8.3.1

next prev parent reply	other threads:[~2013-09-12 10:50 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-12 10:41 [PATCH 00/11] ipv6: Do route updating for redirect in ndisc layer Duan Jiong
2013-09-12 10:43 ` [PATCH 01/11] " Duan Jiong
2013-09-12 21:54   ` Hannes Frederic Sowa
2013-09-12 10:44 ` [PATCH 02/11] dccp: move route updating for redirect to " Duan Jiong
2013-09-12 10:45 ` [PATCH 03/11] ipv6: " Duan Jiong
2013-09-12 10:46 ` [PATCH 04/11] " Duan Jiong
2013-09-12 19:03   ` David Miller
2013-09-12 10:47 ` [PATCH 05/11] " Duan Jiong
2013-09-12 10:49 ` [PATCH 06/11] ip6tnl: " Duan Jiong
2013-09-12 10:49 ` Duan Jiong [this message]
2013-09-12 10:50 ` [PATCH 08/11] ipv6: " Duan Jiong
2013-09-12 10:51 ` [PATCH 09/11] sctp: " Duan Jiong
2013-09-12 12:33   ` Daniel Borkmann
2013-09-12 10:51 ` [PATCH 10/11] ipv6: " Duan Jiong
2013-09-12 22:04   ` Hannes Frederic Sowa
2013-09-13  1:38     ` Duan Jiong
2013-09-12 10:52 ` [PATCH 11/11] " Duan Jiong

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:5636a91 dfblob:e943158 )
 OR (
bs:"[PATCH 07/11] ipv6: move route updating for redirect to ndisc layer" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52319C57.5030402@cn.fujitsu.com \
    --to=duanj.fnst@cn$(echo .)fujitsu.com \
    --cc=davem@davemloft$(echo .)net \
    --cc=hannes@stressinduktion$(echo .)org \
    --cc=netdev@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox