From patchwork Sun Sep 30 06:44:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maciej_=C5=BBenczykowski?= X-Patchwork-Id: 976772 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42NGBX5HM7z9s4s for ; Sun, 30 Sep 2018 16:45:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727821AbeI3NQu convert rfc822-to-8bit (ORCPT ); Sun, 30 Sep 2018 09:16:50 -0400 Received: from mail-qk1-f201.google.com ([209.85.222.201]:40741 "EHLO mail-qk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727496AbeI3NQu (ORCPT ); Sun, 30 Sep 2018 09:16:50 -0400 Received: by mail-qk1-f201.google.com with SMTP id a130-v6so10767867qkb.7 for ; Sat, 29 Sep 2018 23:45:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=UOGcBNc+xXRz5cmnUWOcCFgnfTkiFjITmiJ0g2LuK6Y=; b=CVAOo8ztQW8vNd69qobjWRKwVNtO8oUOIfGutaIALVYNPC7IZcD3isvyyBVbHAYj0L sd+Wjs6DOOhkZeS9tTrXaOWzEFqxBA8w21gjz0ysVw2RuE9WwELXDrt8iPuzPL2we6aF i8PsiuBBLdH4jTrsfMscqQ38255aSp3ezUjaqdzNygtXvdQlVNSauNfabAxVnwi+L0TT 8N9lT2COkBBZdp6dozfRFZ7ZLvwBi0bYuEJlp/IfwDcP0C03R6r72G6yh+CuoqkgJyet ur1QF/5+hnb4Mqp5OyS/bNfcULVxu2APzirDtoCNpJCfX1IIE9OPIY3akLDZGujG1gT+ LrxA== X-Gm-Message-State: ABuFfogHkzqLpliqY65vFQ49FBwCSiuEh1X9F6g+sA9mDqUhOTIIq2+l ByMneocO4cbskxIz/38lQcghWg== X-Google-Smtp-Source: ACcGV62kPBxsvqbe2xj5yORqN7Bwq/s4mTXQuo828JJD57FJ0ShO9K7RQIbqxu7Q4LbwctHRf5VxfFf2 X-Received: by 2002:ac8:6b0f:: with SMTP id w15-v6mr4464033qts.21.1538289906885; Sat, 29 Sep 2018 23:45:06 -0700 (PDT) Date: Sat, 29 Sep 2018 23:44:50 -0700 In-Reply-To: <20180930064454.187537-1-zenczykowski@gmail.com> Message-Id: <20180930064454.187537-5-zenczykowski@gmail.com> Mime-Version: 1.0 References: <20180930064454.187537-1-zenczykowski@gmail.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog Subject: [PATCH v2 5/9] net: remove 1 always zero parameter from ip6_redirect_no_header() From: "=?UTF-8?q?Maciej=20=C5=BBenczykowski?=" To: "=?UTF-8?q?Maciej=20=C5=BBenczykowski?=" , "David S . Miller" Cc: netdev@vger.kernel.org, David Ahern Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maciej Żenczykowski (the parameter in question is mark) Signed-off-by: Maciej Żenczykowski Reviewed-by: David Ahern --- include/net/ip6_route.h | 3 +-- net/ipv6/ndisc.c | 2 +- net/ipv6/route.c | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 7b9c82de11cc..cef186dbd2ce 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -165,8 +165,7 @@ void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu, int oif, void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu); void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark, kuid_t uid); -void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif, - u32 mark); +void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif); void ip6_sk_redirect(struct sk_buff *skb, struct sock *sk); struct netlink_callback; diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 0ec273997d1d..51863ada15a4 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1533,7 +1533,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb) if (!ndopts.nd_opts_rh) { ip6_redirect_no_header(skb, dev_net(skb->dev), - skb->dev->ifindex, 0); + skb->dev->ifindex); return; } diff --git a/net/ipv6/route.c b/net/ipv6/route.c index dff80697c033..e50525a95a09 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2524,8 +2524,7 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark, } EXPORT_SYMBOL_GPL(ip6_redirect); -void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif, - u32 mark) +void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif) { const struct ipv6hdr *iph = ipv6_hdr(skb); const struct rd_msg *msg = (struct rd_msg *)icmp6_hdr(skb); @@ -2533,7 +2532,6 @@ void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif, struct flowi6 fl6 = { .flowi6_iif = LOOPBACK_IFINDEX, .flowi6_oif = oif, - .flowi6_mark = mark, .daddr = msg->dest, .saddr = iph->daddr, .flowi6_uid = sock_net_uid(net, NULL),