Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e871225 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Greg Kroah-Hartman
Browse files

net: ip_rt_get_source() - use new style struct initializer instead of memset 



[ Upstream commit e351bb6227fbe2bb5da6f38a4cf5bd18810b0557 ]

(allows for better compiler optimization)

Signed-off-by: default avatarMaciej Żenczykowski <maze@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: cc73bbab4b1f ("ipv4: Fix incorrect source address in Record Route option")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3213ac4e

net/ipv4/route.c

+9 −12
Original line number Diff line number Diff line
@@ -1273,18 +1273,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)