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;