From patchwork Mon May 8 11:11:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangbin Liu X-Patchwork-Id: 759595 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wM0F94pvJz9s5L for ; Mon, 8 May 2017 21:11:41 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WNce9BlY"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753311AbdEHLLj (ORCPT ); Mon, 8 May 2017 07:11:39 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:32862 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752156AbdEHLLi (ORCPT ); Mon, 8 May 2017 07:11:38 -0400 Received: by mail-pg0-f65.google.com with SMTP id s62so10148903pgc.0 for ; Mon, 08 May 2017 04:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=5YlFfZ6uLFXIZnN/O2JtMb/MZSi0kDtTa2TMsJ3zWD8=; b=WNce9BlYMsdRpA8+pPOQsyE8xf3RL0RUjxNnwNlTHGLRLW8FYRM+vXpEw13r6CBYMP h5B7X9ypY5i2i+R8XagYJWSp4I3Z+YLRmqZ6xp19WCFnN1vjX8Ejc5IMMu3Y486JAUOE FCcgarW7uuBcnQKxLy8m4VE0KkZiFFxF9NcKa5XzQNE+MNMzbcrqpmABtB3caBb6lTX0 LbpmDnBZGKMT1tMD+ksmHRJM89F1mdTiA2OFrrZlVqbzIuSqw/q85O/hch9j6av2aRR7 stsPUZ1r3QkwNCYEMO3sDDiJ8GBhsF8bn+MM2PevMdg7Oh0TRUWyUKbsb+zRdhHgcTlC XCEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=5YlFfZ6uLFXIZnN/O2JtMb/MZSi0kDtTa2TMsJ3zWD8=; b=MDULXsT5+VzQ/E2tq+cVSdmsb/CcyKCGG/5uaeyZ+1wbz/XLsTLn/g+i/kGFWrPBoH t5YQWXbHhiYKnM0ms5mtRCq5kSATg1Yxovkq4HXLS40jHer1omMQz+trjnW96wHOWJIO 0ugCkDnkX3Thn0Uc5+fTmaz1Fl/r7hp94/Xdw9irZL0U/E3B4ILaWlBWJmE5ZE2WSTiP PgFPDjbBkPgpjugknBynFv161a+I+i431W/YGGC99albFcMLcna5zBo/VfKPiJYiMdWq V98XPe0E4MzIwdjbe7ijttj1khkcex9ZjlkfT5BNlSkeOQ8U3Mv16jBKdfN0hZ880GBH cmgQ== X-Gm-Message-State: AODbwcCblKm/ilKNgFmLTMcv+g+ADgnWuOUFxSPIL0Wip1ng2tQWq6Kw vkE6RF+GtO+KZw== X-Received: by 10.98.217.5 with SMTP id s5mr9596757pfg.42.1494241897748; Mon, 08 May 2017 04:11:37 -0700 (PDT) Received: from leo.usersys.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id k79sm1234554pfj.6.2017.05.08.04.11.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 May 2017 04:11:35 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Hangbin Liu Subject: [PATCH net] ip6_tunnel: remove unreachable ICMP_REDIRECT code Date: Mon, 8 May 2017 19:11:03 +0800 Message-Id: <1494241863-32549-1-git-send-email-liuhangbin@gmail.com> X-Mailer: git-send-email 2.5.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After call ip6_tnl_err(), the rel_type will be ether ICMPV6_DEST_UNREACH or ICMPV6_PKT_TOOBIG. We will never reach ICMP_REDIRECT. So remove it. Signed-off-by: Hangbin Liu --- net/ipv6/ip6_tunnel.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 6eb2ae5..16f8d42 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -591,9 +591,6 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, rel_type = ICMP_DEST_UNREACH; rel_code = ICMP_FRAG_NEEDED; break; - case NDISC_REDIRECT: - rel_type = ICMP_REDIRECT; - rel_code = ICMP_REDIR_HOST; default: return 0; } @@ -652,8 +649,6 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, skb_dst(skb2)->ops->update_pmtu(skb_dst(skb2), NULL, skb2, rel_info); } - if (rel_type == ICMP_REDIRECT) - skb_dst(skb2)->ops->redirect(skb_dst(skb2), NULL, skb2); icmp_send(skb2, rel_type, rel_code, htonl(rel_info));