From patchwork Sun Sep 30 06:44:46 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: 976768 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 42NGBT5Xlkz9s4s for ; Sun, 30 Sep 2018 16:45:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727569AbeI3NQl convert rfc822-to-8bit (ORCPT ); Sun, 30 Sep 2018 09:16:41 -0400 Received: from mail-pf1-f201.google.com ([209.85.210.201]:53523 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727496AbeI3NQk (ORCPT ); Sun, 30 Sep 2018 09:16:40 -0400 Received: by mail-pf1-f201.google.com with SMTP id b17-v6so11920522pfo.20 for ; Sat, 29 Sep 2018 23:44:57 -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:message-id:mime-version:subject:from:to:cc :content-transfer-encoding; bh=STIdnlpIgsK63t3kBjwnnX2IBlvPS2zaQxqM8c7InKs=; b=Ci6cPzdRQJW4jmOV1oAAyJmqgO02MAE7cm6UJYGORdwYUw8WYA9F+MZqgRTKWa834H 6q+P4/yt8pkgS7ftOVT+z9IVhSjwX1Hp3cmrdL/tYFjGBCfIMEnhe+8m9F30EVC2W45c x/Yg3CsiyL1ugdKRUt3cDfvNlJY8GBMcu7DvmTMAQQhoV4l3N1wkUDZz+iBFHmpTi7yW wzW9sHYyeCNP5xKopdrSUWF4BQC7FxrJ/C9aYb0rGwLgfSNGPohFGVRUZzWafwwx4e/U 6tq0QVMvDp7oHJ5+CwbBaj1LHfN333bX0SR6sevRTXFk+5PdkX6HXbUODT8WowXjhinK HznQ== X-Gm-Message-State: ABuFfogViLaTQGxx7WLn3vmi07OON+NFSL3Sy6kF7tvBEzEteiGG7YBE etyY6xahipUTh5eXF4vfEuzCeA== X-Google-Smtp-Source: ACcGV60yDP7cb2y1lz1JsyqvTzPZcdDGvFjKuc5XSUZI8R7jf+MuePstWjFBiQ/X7mzPJcD4CkQim3br X-Received: by 2002:a65:5cc1:: with SMTP id b1-v6mr1256335pgt.82.1538289897607; Sat, 29 Sep 2018 23:44:57 -0700 (PDT) Date: Sat, 29 Sep 2018 23:44:46 -0700 Message-Id: <20180930064454.187537-1-zenczykowski@gmail.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog Subject: [PATCH v2 1/9] net: ip_rt_get_source() - use new style struct initializer instead of memset 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 (allows for better compiler optimization) Signed-off-by: Maciej Żenczykowski Reviewed-by: David Ahern --- net/ipv4/route.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index dce2ed66ebe1..02482b71498b 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1217,18 +1217,15 @@ void ip_rt_get_source(u8 *addr, struct sk_buff *skb, struct rtable *rt) src = ip_hdr(skb)->saddr; else { struct fib_result res; - struct flowi4 fl4; - struct iphdr *iph; - - iph = ip_hdr(skb); - - memset(&fl4, 0, sizeof(fl4)); - fl4.daddr = iph->daddr; - fl4.saddr = iph->saddr; - fl4.flowi4_tos = RT_TOS(iph->tos); - fl4.flowi4_oif = rt->dst.dev->ifindex; - fl4.flowi4_iif = skb->dev->ifindex; - fl4.flowi4_mark = skb->mark; + struct iphdr *iph = ip_hdr(skb); + struct flowi4 fl4 = { + .daddr = iph->daddr, + .saddr = iph->saddr, + .flowi4_tos = RT_TOS(iph->tos), + .flowi4_oif = rt->dst.dev->ifindex, + .flowi4_iif = skb->dev->ifindex, + .flowi4_mark = skb->mark, + }; rcu_read_lock(); if (fib_lookup(dev_net(rt->dst.dev), &fl4, &res, 0) == 0) From patchwork Sun Sep 30 06:44:47 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: 976769 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 42NGBV4df1z9s55 for ; Sun, 30 Sep 2018 16:45:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727651AbeI3NQn convert rfc822-to-8bit (ORCPT ); Sun, 30 Sep 2018 09:16:43 -0400 Received: from mail-vk1-f201.google.com ([209.85.221.201]:47368 "EHLO mail-vk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727496AbeI3NQn (ORCPT ); Sun, 30 Sep 2018 09:16:43 -0400 Received: by mail-vk1-f201.google.com with SMTP id v4-v6so2688971vkd.14 for ; Sat, 29 Sep 2018 23:45:00 -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=ntHU7jCpGSsTUie+n4KNjwb5c6fhDYoH7WLZkVLAtA4=; b=R4tJmMovq7op0uKZQBZSgclJ1DSnc95q656CkgQbIPZuxSMst7mOiyxoEGzGnL9gvL gNMivuObG1UdPSN9vDYinK0r0PXlykKDa15U57tk0bnxHXK/UWVtMIR2XuifSW4dy+Ie hE9iik3vXr1JWC/ugHO/dlPfw3AHIuKK7X2jGQ6PWqZYfa54/mGQ0z88+zkLwkVdChOx MCcMkOkYMLMuO2Mxe2dNnm9rrGl5Yaqqzm1oYJ22p569b2wKOQAOuLHd94NxtVn44Won P6kouVC4x8bs0SnC4/t0seUcNef27fGZn+4KWxDawwhRAT0B3+0HEOz9RGiORjUBfPVG 6aVQ== X-Gm-Message-State: ABuFfoiIc7+lNZ9L9v1+dq1R5HOOz5vT/lGXuJjkcQcUW6DUCli6DWXN rswSejv8OEnFIq9XJVTPpe62KA== X-Google-Smtp-Source: ACcGV60M+6aMPi9RZSNScAI3OAgrM9etUUjaDZ5/ZvetPU0gKoThmicWOlTL60uaU4EFEk++blTTqDFd X-Received: by 2002:a67:80d3:: with SMTP id b202-v6mr5818592vsd.8.1538289899915; Sat, 29 Sep 2018 23:44:59 -0700 (PDT) Date: Sat, 29 Sep 2018 23:44:47 -0700 In-Reply-To: <20180930064454.187537-1-zenczykowski@gmail.com> Message-Id: <20180930064454.187537-2-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 2/9] net: inet_rtm_getroute() - use new style struct initializer instead of memset 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 Signed-off-by: Maciej Żenczykowski Reviewed-by: David Ahern --- net/ipv4/route.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 02482b71498b..048919713f4e 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2780,7 +2780,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, struct rtable *rt = NULL; struct sk_buff *skb; struct rtmsg *rtm; - struct flowi4 fl4; + struct flowi4 fl4 = {}; __be32 dst = 0; __be32 src = 0; kuid_t uid; @@ -2820,7 +2820,6 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, if (!skb) return -ENOBUFS; - memset(&fl4, 0, sizeof(fl4)); fl4.daddr = dst; fl4.saddr = src; fl4.flowi4_tos = rtm->rtm_tos; From patchwork Sun Sep 30 06:44:48 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: 976770 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 42NGBW2pMCz9s4s for ; Sun, 30 Sep 2018 16:45:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727744AbeI3NQp convert rfc822-to-8bit (ORCPT ); Sun, 30 Sep 2018 09:16:45 -0400 Received: from mail-pg1-f201.google.com ([209.85.215.201]:46811 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727496AbeI3NQp (ORCPT ); Sun, 30 Sep 2018 09:16:45 -0400 Received: by mail-pg1-f201.google.com with SMTP id r130-v6so11525833pgr.13 for ; Sat, 29 Sep 2018 23:45:02 -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=9wsIGQqjAkNzNebFeylBSNPEwp7HaknmKw3koEXBTjg=; b=CHwikQApy1RWPOJKWytbEhyz33s4q542YS989lz1cBYPnMn0Rw3Foh+MoI30Um1uOD hG4mkA12it+CFUHoRNbqUzXOowqqEgHkZjYAIn9lkpC+2W0I2+ybaOVZQzGuNUK9Q8Hg CuE2tYqBidNH0Cua5MimISLT0d50R+A0B330OORVMnj2M7c3wdre3GTu/AFokaiVkZ5X EUQkTHNxUCRgbWmH331J1C3Hcm5ecb10J0+RcfSmQy7soRHVEkomiPtY0LQGY0KljPLR EOYrsArTfmKMo3IfSVoeDSpEXQfP4CaqY/+eMWerYATFMi4MV3Aebc+fPK9gPakq5/6Y +mNw== X-Gm-Message-State: ABuFfoidxyf6cClUy6dtP3GjsFqJZnAiZCbwbKgxAcKQpaPOYwHJRLhs d6W31ZuVa7b0bkUqifBojomBfQ== X-Google-Smtp-Source: ACcGV61QA7p08Y4vSMoHtwliT1x4xyRAPwg3xcVaScOWmkyZoJpQ5ZiLFDg0gZI3U/6qXskD+iSgv054 X-Received: by 2002:a63:103:: with SMTP id 3-v6mr2641556pgb.52.1538289902168; Sat, 29 Sep 2018 23:45:02 -0700 (PDT) Date: Sat, 29 Sep 2018 23:44:48 -0700 In-Reply-To: <20180930064454.187537-1-zenczykowski@gmail.com> Message-Id: <20180930064454.187537-3-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 3/9] net: ip6_redirect() - use new style struct initializer instead of memset 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 (allows for better compiler optimization) Signed-off-by: Maciej Żenczykowski Reviewed-by: David Ahern --- net/ipv6/route.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d28f83e01593..6f252fa914c2 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2508,16 +2508,15 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark, { const struct ipv6hdr *iph = (struct ipv6hdr *) skb->data; struct dst_entry *dst; - struct flowi6 fl6; - - memset(&fl6, 0, sizeof(fl6)); - fl6.flowi6_iif = LOOPBACK_IFINDEX; - fl6.flowi6_oif = oif; - fl6.flowi6_mark = mark; - fl6.daddr = iph->daddr; - fl6.saddr = iph->saddr; - fl6.flowlabel = ip6_flowinfo(iph); - fl6.flowi6_uid = uid; + struct flowi6 fl6 = { + .flowi6_iif = LOOPBACK_IFINDEX, + .flowi6_oif = oif, + .flowi6_mark = mark, + .daddr = iph->daddr, + .saddr = iph->saddr, + .flowlabel = ip6_flowinfo(iph), + .flowi6_uid = uid, + }; dst = ip6_route_redirect(net, &fl6, skb, &ipv6_hdr(skb)->saddr); rt6_do_redirect(dst, NULL, skb); From patchwork Sun Sep 30 06:44:49 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: 976771 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 42NGBX0TzGz9s55 for ; Sun, 30 Sep 2018 16:45:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727799AbeI3NQr convert rfc822-to-8bit (ORCPT ); Sun, 30 Sep 2018 09:16:47 -0400 Received: from mail-pf1-f201.google.com ([209.85.210.201]:32966 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727496AbeI3NQr (ORCPT ); Sun, 30 Sep 2018 09:16:47 -0400 Received: by mail-pf1-f201.google.com with SMTP id t26-v6so11987985pfh.0 for ; Sat, 29 Sep 2018 23:45:04 -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=odYuFR5aRvlU79L2E6EhAeiTlmOm9lZcXQEF+qwndZQ=; b=R1qOoVqomPcL+F9VFgHD3kBN73vAjx0pEfBRwkfVn2MvrkXvZoKI4AlreabdezMxf+ NYGkY6noW4qnLv5SdzZ/ZQbu5dUnM1Kh816stK8CM+uZZIGuLvZW8wDC+eqL9NN+ugT5 yPX+eRWU+E5CM2fSCQXDu4LDEx2kp/uTOzBMvqUdYhlsgBPRht99BXl/G+dmGEp6Ovh3 ZsUGLk1Wq1CUeo7TMqidIdxPGrv6kXus3833O69M/FpkTYf574IAAa/sIJyy7kp9vFhq ogFer+etg1/MTKNbL+3ESpFGIMyIM3UIf6pPT4UUouwHk9ZuKn4hpu84wf1u4f5dV0S7 XUYw== X-Gm-Message-State: ABuFfoh4ZW1SIP+1OvGwN5gJ70BEkL3z8PbFYOYZK9oS5PMy/+LdC8cY o7mARW3k0dcMpUJYEWovEu9+gw== X-Google-Smtp-Source: ACcGV63ntH2/92CPo5h0DBBqJu0Q/gLh61eA6Wq0Znge6rc438+f2vhMTkG9uTqwrqBuZdb0bk5Y5KGt X-Received: by 2002:a62:f51b:: with SMTP id n27-v6mr2728855pfh.67.1538289904325; Sat, 29 Sep 2018 23:45:04 -0700 (PDT) Date: Sat, 29 Sep 2018 23:44:49 -0700 In-Reply-To: <20180930064454.187537-1-zenczykowski@gmail.com> Message-Id: <20180930064454.187537-4-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 4/9] net: ip6_redirect_no_header() - use new style struct initializer instead of memset 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 (allows for better compiler optimization) Signed-off-by: Maciej Żenczykowski Reviewed-by: David Ahern --- net/ipv6/route.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 6f252fa914c2..dff80697c033 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2530,15 +2530,14 @@ 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); struct dst_entry *dst; - struct flowi6 fl6; - - memset(&fl6, 0, sizeof(fl6)); - fl6.flowi6_iif = LOOPBACK_IFINDEX; - fl6.flowi6_oif = oif; - fl6.flowi6_mark = mark; - fl6.daddr = msg->dest; - fl6.saddr = iph->daddr; - fl6.flowi6_uid = sock_net_uid(net, NULL); + 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), + }; dst = ip6_route_redirect(net, &fl6, skb, &iph->saddr); rt6_do_redirect(dst, NULL, skb); 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), From patchwork Sun Sep 30 06:44:51 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: 976773 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 42NGBY39Frz9s55 for ; Sun, 30 Sep 2018 16:45:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727862AbeI3NQx convert rfc822-to-8bit (ORCPT ); Sun, 30 Sep 2018 09:16:53 -0400 Received: from mail-vs1-f73.google.com ([209.85.217.73]:40129 "EHLO mail-vs1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727496AbeI3NQx (ORCPT ); Sun, 30 Sep 2018 09:16:53 -0400 Received: by mail-vs1-f73.google.com with SMTP id z6-v6so3913702vsl.7 for ; Sat, 29 Sep 2018 23:45:09 -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=zO/cTIBHA969hZZ04yAkRw45rRaYTBBAAEyyNR9lGeY=; b=OcueWK2S/Gahrjvr+n6fvPqXFEq9/j1yRoyramn4FMnx4cNOdPDe4ehjZwjhj6VS6Y X/cx1+FwpKraZqWrW5Jlp4A0xN2nTahJKLaecLDB67l7uPKMqJV/9ARgNKi5RHJIYsPo VJL6OBahv7Pz/VK9eK3X4JQtmSIeMwlXsogvaSUKP8suv+9+OkH0XutMuz9nozf4VUV2 TbQ8X81se8G11zlWF2QZRqC179SLJc2GbJnCdvwLTuqqw+lan9grF0Lc0Nd4yQf7DNDB UwtKpyz1i0MEAdK3wGOgSoajeajnyfo5fsApKI9moAh1gfCMxzU8nZb/It7dpti7PyiE vnNg== X-Gm-Message-State: ABuFfojAl4Hx2i+oRPtmhnQUMPCy7a2bVfcTJxxjYinkW3dULNHD96U5 a9Lz+ZRuMRBKupx2h/20a8VMxg== X-Google-Smtp-Source: ACcGV608pNq4iuPyOUZAi/bunGSvxYmlapF1gDlhL44UbyXylrsxop/dYz5CC5JCt4CNqdv3WpGl/yuw X-Received: by 2002:a67:80d3:: with SMTP id b202-v6mr5819078vsd.8.1538289909379; Sat, 29 Sep 2018 23:45:09 -0700 (PDT) Date: Sat, 29 Sep 2018 23:44:51 -0700 In-Reply-To: <20180930064454.187537-1-zenczykowski@gmail.com> Message-Id: <20180930064454.187537-6-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 6/9] net: ip6_update_pmtu() - use new style struct initializer instead of memset 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 (allows for better compiler optimization) Signed-off-by: Maciej Żenczykowski Reviewed-by: David Ahern --- net/ipv6/route.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e50525a95a09..dd19cf8dbcc1 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2349,15 +2349,14 @@ void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu, { const struct ipv6hdr *iph = (struct ipv6hdr *) skb->data; struct dst_entry *dst; - struct flowi6 fl6; - - memset(&fl6, 0, sizeof(fl6)); - fl6.flowi6_oif = oif; - fl6.flowi6_mark = mark ? mark : IP6_REPLY_MARK(net, skb->mark); - fl6.daddr = iph->daddr; - fl6.saddr = iph->saddr; - fl6.flowlabel = ip6_flowinfo(iph); - fl6.flowi6_uid = uid; + struct flowi6 fl6 = { + .flowi6_oif = oif, + .flowi6_mark = mark ? mark : IP6_REPLY_MARK(net, skb->mark), + .daddr = iph->daddr, + .saddr = iph->saddr, + .flowlabel = ip6_flowinfo(iph), + .flowi6_uid = uid, + }; dst = ip6_route_output(net, NULL, &fl6); if (!dst->error) From patchwork Sun Sep 30 06:44:52 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: 976774 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 42NGBZ30CNz9s4s for ; Sun, 30 Sep 2018 16:45:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727957AbeI3NQz convert rfc822-to-8bit (ORCPT ); Sun, 30 Sep 2018 09:16:55 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:37249 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727496AbeI3NQy (ORCPT ); Sun, 30 Sep 2018 09:16:54 -0400 Received: by mail-pf1-f202.google.com with SMTP id v9-v6so11966242pff.4 for ; Sat, 29 Sep 2018 23:45:11 -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=ZZQlX73x/v8zvOkGqRGK5BiQ81nfu4k4Wen1IB35ASg=; b=p+Ilj7NSIUFZLM22RjywJk5elIalXmhNZBmgH88ihigOTgNIJqhp90juJK2SvNRq0Z DyM3K1LsTmEPvWQDUfcohiRt/9bmxLLW5dNHP+wU8tQR8CI3i1R/hdsUouZXalphPmrF TjWajrbH22rRliypxDi3E5V4b47dMFryGN3iWp2MHyxdooUACZHkPz5PzC3g2DGvg18q 4IGe6ziTv5e6If0JVIB1zSWLIOa41bt/uwYexU9XUKeIOoOus2OormQ/xmPvijoSmzFO cKnM/eZMcCJVYtatGX7x9ue9Dex7snkx2Uhz4AfZahdIi6H6wVnBcwF8CxRsQQYpOKPn wEiw== X-Gm-Message-State: ABuFfoizVbhoZpJx/rT/JJwhk1/xLx6HFzCErCC1bbuAaw9RcDJHrEBb jhSRCWWWpUJqwMpuqD0gJzpaFg== X-Google-Smtp-Source: ACcGV62VJV68RNzIzbE8zCGSKFL3/n6e1dIyheSZRP3he+GRDLUOrcb/q+o2DFDLgnrjhXxNmkRSqaqb X-Received: by 2002:a62:b506:: with SMTP id y6-v6mr2605750pfe.7.1538289911693; Sat, 29 Sep 2018 23:45:11 -0700 (PDT) Date: Sat, 29 Sep 2018 23:44:52 -0700 In-Reply-To: <20180930064454.187537-1-zenczykowski@gmail.com> Message-Id: <20180930064454.187537-7-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 7/9] net: rtmsg_to_fib6_config() - use new style struct initializer instead of memset 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 (allows for better compiler optimization) Signed-off-by: Maciej Żenczykowski Reviewed-by: David Ahern --- net/ipv6/route.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index dd19cf8dbcc1..c312ad4046d1 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -3604,23 +3604,23 @@ static void rtmsg_to_fib6_config(struct net *net, struct in6_rtmsg *rtmsg, struct fib6_config *cfg) { - memset(cfg, 0, sizeof(*cfg)); + *cfg = (struct fib6_config){ + .fc_table = l3mdev_fib_table_by_index(net, rtmsg->rtmsg_ifindex) ? + : RT6_TABLE_MAIN, + .fc_ifindex = rtmsg->rtmsg_ifindex, + .fc_metric = rtmsg->rtmsg_metric, + .fc_expires = rtmsg->rtmsg_info, + .fc_dst_len = rtmsg->rtmsg_dst_len, + .fc_src_len = rtmsg->rtmsg_src_len, + .fc_flags = rtmsg->rtmsg_flags, + .fc_type = rtmsg->rtmsg_type, + + .fc_nlinfo.nl_net = net, - cfg->fc_table = l3mdev_fib_table_by_index(net, rtmsg->rtmsg_ifindex) ? - : RT6_TABLE_MAIN; - cfg->fc_ifindex = rtmsg->rtmsg_ifindex; - cfg->fc_metric = rtmsg->rtmsg_metric; - cfg->fc_expires = rtmsg->rtmsg_info; - cfg->fc_dst_len = rtmsg->rtmsg_dst_len; - cfg->fc_src_len = rtmsg->rtmsg_src_len; - cfg->fc_flags = rtmsg->rtmsg_flags; - cfg->fc_type = rtmsg->rtmsg_type; - - cfg->fc_nlinfo.nl_net = net; - - cfg->fc_dst = rtmsg->rtmsg_dst; - cfg->fc_src = rtmsg->rtmsg_src; - cfg->fc_gateway = rtmsg->rtmsg_gateway; + .fc_dst = rtmsg->rtmsg_dst, + .fc_src = rtmsg->rtmsg_src, + .fc_gateway = rtmsg->rtmsg_gateway, + }; } int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg) From patchwork Sun Sep 30 06:44:53 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: 976775 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 42NGBb0SjCz9s55 for ; Sun, 30 Sep 2018 16:45:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727992AbeI3NQ5 convert rfc822-to-8bit (ORCPT ); Sun, 30 Sep 2018 09:16:57 -0400 Received: from mail-io1-f74.google.com ([209.85.166.74]:36744 "EHLO mail-io1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727496AbeI3NQ5 (ORCPT ); Sun, 30 Sep 2018 09:16:57 -0400 Received: by mail-io1-f74.google.com with SMTP id s5-v6so10379073iop.3 for ; Sat, 29 Sep 2018 23:45:14 -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=SUafL6le3OtAYIfg3rb9/Vr2y3HRoS24rRutvbDSiEo=; b=IjEh59CSI83OL8sMS2AhtiKTfXAUGm6qxDnhrLbyBKQYD4RaamjwedNuhDwOXseJai o+4LKxjSYBGlm53Ov7+JkPccLryI+mvzydTPv4UdXtQn5B2PMY5Ow+pXRReSORFeeAl5 LldqNefeziWVTGbSaoI106i7woIZYlyCNwWyWfJ05ZDVq7b9peLLrWbeURNEf3nnKOEi t2gZW5nkoaUC4Ofd9QWQqtoRc38IoLhcKKuXeMw39GQel3FU8mi/6PjZNDH5U4h6OVB7 7BszNqXKMs9TbVU2alo4rXkOggEJyvcJrcHD542izaDJ5MHGFRZSF4ubqQIbyl8gjgmT APYg== X-Gm-Message-State: ABuFfog9hJG5jZgTQ5qMZEcpIzK62gqbuShIqkAdPrcYPH05y+k9QM6F BoC4uu1Ai15q00ucalfTOpfaLA== X-Google-Smtp-Source: ACcGV62abNp1sgZ7swkXFFHqmmoibB+bfJCeVzreREU0XI484Qyg7I4FP6QoeFBTa3oc5DWOvaOwQmVD X-Received: by 2002:a24:2b87:: with SMTP id h129-v6mr6767876ita.13.1538289913997; Sat, 29 Sep 2018 23:45:13 -0700 (PDT) Date: Sat, 29 Sep 2018 23:44:53 -0700 In-Reply-To: <20180930064454.187537-1-zenczykowski@gmail.com> Message-Id: <20180930064454.187537-8-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 8/9] net: rtm_to_fib6_config() - use new style struct initializer instead of memset 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 (allows for better compiler optimization) Signed-off-by: Maciej Żenczykowski Reviewed-by: David Ahern --- net/ipv6/route.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index c312ad4046d1..be5f7a15bc38 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -4143,14 +4143,19 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh, err = -EINVAL; rtm = nlmsg_data(nlh); - memset(cfg, 0, sizeof(*cfg)); - cfg->fc_table = rtm->rtm_table; - cfg->fc_dst_len = rtm->rtm_dst_len; - cfg->fc_src_len = rtm->rtm_src_len; - cfg->fc_flags = RTF_UP; - cfg->fc_protocol = rtm->rtm_protocol; - cfg->fc_type = rtm->rtm_type; + *cfg = (struct fib6_config){ + .fc_table = rtm->rtm_table, + .fc_dst_len = rtm->rtm_dst_len, + .fc_src_len = rtm->rtm_src_len, + .fc_flags = RTF_UP, + .fc_protocol = rtm->rtm_protocol, + .fc_type = rtm->rtm_type, + + .fc_nlinfo.portid = NETLINK_CB(skb).portid, + .fc_nlinfo.nlh = nlh, + .fc_nlinfo.nl_net = sock_net(skb->sk), + }; if (rtm->rtm_type == RTN_UNREACHABLE || rtm->rtm_type == RTN_BLACKHOLE || @@ -4166,10 +4171,6 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh, cfg->fc_flags |= (rtm->rtm_flags & RTNH_F_ONLINK); - cfg->fc_nlinfo.portid = NETLINK_CB(skb).portid; - cfg->fc_nlinfo.nlh = nlh; - cfg->fc_nlinfo.nl_net = sock_net(skb->sk); - if (tb[RTA_GATEWAY]) { cfg->fc_gateway = nla_get_in6_addr(tb[RTA_GATEWAY]); cfg->fc_flags |= RTF_GATEWAY; From patchwork Sun Sep 30 06:44:54 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: 976776 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 42NGBb4vmdz9s4s for ; Sun, 30 Sep 2018 16:45:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728015AbeI3NRA convert rfc822-to-8bit (ORCPT ); Sun, 30 Sep 2018 09:17:00 -0400 Received: from mail-io1-f73.google.com ([209.85.166.73]:36744 "EHLO mail-io1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727496AbeI3NQ7 (ORCPT ); Sun, 30 Sep 2018 09:16:59 -0400 Received: by mail-io1-f73.google.com with SMTP id s5-v6so10379122iop.3 for ; Sat, 29 Sep 2018 23:45:16 -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=N9Z/nXH518YSC4UPF7w+9Hl35rNAr29T1Nim8n794tQ=; b=XtFC1WtHC4iS5qv8tgWXT4sRcfkOOoPaJGg8ywYRw//CxaRt8Y4I8dh71Wc6+R7wJp +fglt0IH9B6tu9F4OpeBrApZPf3GM3X2E7TRWJ/xEfkkSiapnssM3qZ5XeD4k4H/Owfe N5atA2dp8vvavDCibVGZogQGUyAtaFE7lNE0NU5S5Am7N+PVID4aB4mQgVTJxIdOkeOZ pVltlyTx7gR+T7uYlXzj+c3MNxRRMnU+znduSE23beias+vzCKE/TyxAd4XdJ4R40Oe+ XMLXcOgcijFzFk/uDceBi99/Z+Qq+yZNJI0XeFzAUvXHCtYIXZ4F6VAH5qn1yVsqs2Uy QQQw== X-Gm-Message-State: ABuFfojvhKq7twhK5CregOPWrm/4IN1UmcDeO9fiPVzTrFgKMybHC3Mc //INpf1l6qjFb55BVJxcOoaLdA== X-Google-Smtp-Source: ACcGV61C/AAU2NnQdmZjraAKRuo+nFlQLagSt9A7B3tYq84C/Yx8zOs2VapeUOcmz2ChDw3rhE2uPSKS X-Received: by 2002:a24:6b97:: with SMTP id v145-v6mr3050622itc.40.1538289916291; Sat, 29 Sep 2018 23:45:16 -0700 (PDT) Date: Sat, 29 Sep 2018 23:44:54 -0700 In-Reply-To: <20180930064454.187537-1-zenczykowski@gmail.com> Message-Id: <20180930064454.187537-9-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 9/9] net: inet6_rtm_getroute() - use new style struct initializer instead of memset 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 Signed-off-by: Maciej Żenczykowski Reviewed-by: David Ahern --- net/ipv6/route.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index be5f7a15bc38..6311a7fc5f63 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -4823,7 +4823,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, struct rt6_info *rt; struct sk_buff *skb; struct rtmsg *rtm; - struct flowi6 fl6; + struct flowi6 fl6 = {}; bool fibmatch; err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy, @@ -4832,7 +4832,6 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, goto errout; err = -EINVAL; - memset(&fl6, 0, sizeof(fl6)); rtm = nlmsg_data(nlh); fl6.flowlabel = ip6_make_flowinfo(rtm->rtm_tos, 0); fibmatch = !!(rtm->rtm_flags & RTM_F_FIB_MATCH);