From mboxrd@z Thu Jan 1 00:00:00 1970 From: "=?UTF-8?q?Maciej=20=C5=BBenczykowski?=" Subject: [PATCH 04/11] net: ip6_multipath_l3_keys() - use new style struct initializer instead of memset Date: Thu, 27 Sep 2018 16:00:10 -0700 Message-ID: <20180927230017.15398-4-zenczykowski@gmail.com> References: <20180927230017.15398-1-zenczykowski@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Cc: netdev@vger.kernel.org To: "=?UTF-8?q?Maciej=20=C5=BBenczykowski?=" , "David S . Miller" Return-path: Received: from mail-vk1-f201.google.com ([209.85.221.201]:34446 "EHLO mail-vk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725972AbeI1FVM (ORCPT ); Fri, 28 Sep 2018 01:21:12 -0400 Received: by mail-vk1-f201.google.com with SMTP id o62-v6so1191601vko.1 for ; Thu, 27 Sep 2018 16:00:33 -0700 (PDT) In-Reply-To: <20180927230017.15398-1-zenczykowski@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Maciej Żenczykowski Signed-off-by: Maciej Żenczykowski --- net/ipv6/route.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d28f83e01593..9cb024451fc5 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1981,12 +1981,11 @@ static void ip6_multipath_l3_keys(const struct sk_buff *skb, u32 rt6_multipath_hash(const struct net *net, const struct flowi6 *fl6, const struct sk_buff *skb, struct flow_keys *flkeys) { - struct flow_keys hash_keys; + struct flow_keys hash_keys = {}; u32 mhash; switch (ip6_multipath_hash_policy(net)) { case 0: - memset(&hash_keys, 0, sizeof(hash_keys)); hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS; if (skb) { ip6_multipath_l3_keys(skb, &hash_keys, flkeys); @@ -2006,8 +2005,6 @@ u32 rt6_multipath_hash(const struct net *net, const struct flowi6 *fl6, if (skb->l4_hash) return skb_get_hash_raw(skb) >> 1; - memset(&hash_keys, 0, sizeof(hash_keys)); - if (!flkeys) { skb_flow_dissect_flow_keys(skb, &keys, flag); flkeys = &keys; @@ -2019,7 +2016,6 @@ u32 rt6_multipath_hash(const struct net *net, const struct flowi6 *fl6, hash_keys.ports.dst = flkeys->ports.dst; hash_keys.basic.ip_proto = flkeys->basic.ip_proto; } else { - memset(&hash_keys, 0, sizeof(hash_keys)); hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS; hash_keys.addrs.v6addrs.src = fl6->saddr; hash_keys.addrs.v6addrs.dst = fl6->daddr; -- 2.19.0.605.g01d371f741-goog