From patchwork Thu Sep 27 23:00:16 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: 975952 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 42LqzP2YN8z9s5c for ; Fri, 28 Sep 2018 09:00:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728510AbeI1FV0 convert rfc822-to-8bit (ORCPT ); Fri, 28 Sep 2018 01:21:26 -0400 Received: from mail-io1-f74.google.com ([209.85.166.74]:44824 "EHLO mail-io1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725972AbeI1FV0 (ORCPT ); Fri, 28 Sep 2018 01:21:26 -0400 Received: by mail-io1-f74.google.com with SMTP id s15-v6so4480275iob.11 for ; Thu, 27 Sep 2018 16:00:47 -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=3XphfQGY0isDYezohCyJgJdXI/jdHy2X80DaRWcjMBk=; b=Dv+PjtPM6NPxgwf5u9yWETM+nWQrPcSqFaXsEdxTrbCiX6KRJXDPnWkMGEKOPOh7Xi SvBy2ZX1wlD0Sf0iZ/RjS8I+HfPnrk/a87vuWjqCHWEG1TuQsprmyIiL36+ruPQAf4is wcGCU4HJAQAjSq5zPZNSvLHJcCEPdR/Ui0nJhEETx2FMQL8q1o/KljiPuoOFDa587bmk FPp6ytgCOUQTg6W0YxoZI1tqvgxHJg6t9gcsU4nqKnCJTlW77IRZpY5FLADm50YpLOeK A4DEQvepXaGQbLpeMKRt+i+/2ELu4vh+d6oLa+l5FAmurKxgc2x7zetcWKoQgCbctZIf Xacg== X-Gm-Message-State: ABuFfog3AkXlXpcU0HmLI8cNU69W5ffBmu5QwS5VcU9fDD4b3ilBWMc6 jYAsmajeF4JZvRaomuotREiLqw== X-Google-Smtp-Source: ACcGV63O/ciV/1RVydDWDMOv8kl0+fg3iXm6XrVjt+x3mME4kieD2hb5aMIKj/6T9ZRo/9uUpBZTp+vG X-Received: by 2002:a24:2414:: with SMTP id f20-v6mr8327977ita.0.1538089247049; Thu, 27 Sep 2018 16:00:47 -0700 (PDT) Date: Thu, 27 Sep 2018 16:00:16 -0700 In-Reply-To: <20180927230017.15398-1-zenczykowski@gmail.com> Message-Id: <20180927230017.15398-10-zenczykowski@gmail.com> Mime-Version: 1.0 References: <20180927230017.15398-1-zenczykowski@gmail.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog Subject: [PATCH 10/11] 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 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 --- 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 b8fece1d6021..9aca81772c93 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -4139,14 +4139,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 || @@ -4162,10 +4167,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;