]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: ip_rt_get_source() - use new style struct initializer instead of memset
authorMaciej Żenczykowski <maze@google.com>
Sun, 30 Sep 2018 06:44:46 +0000 (23:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Oct 2018 23:12:39 +0000 (16:12 -0700)
(allows for better compiler optimization)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/route.c

index dce2ed66ebe17fcfe6a2c612321c6284ae7bd6f5..02482b71498b4aed2ab013bb0f47d0947ee5b08b 100644 (file)
@@ -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)