Commit 3b7bc938 authored by Petr Machata's avatar Petr Machata Committed by Jakub Kicinski
Browse files

net: ipv4: ipmr: ipmr_queue_xmit(): Drop local variable `dev' 



The variable is used for caching of rt->dst.dev. The netdevice referenced
therein does not change during the scope of validity of that local. At the
same time, the local is only used twice, and each of these uses will end up
in a different function in the following patches, further eliminating any
use the local could have had.

Drop the local altogether and inline the uses.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/c80600a4b51679fe78f429ccb6d60892c2f9e4de.1750113335.git.petrm@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e3411e32

net/ipv4/ipmr.c

+2 −5
Original line number Diff line number Diff line
@@ -1859,7 +1859,6 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, 
	const struct iphdr *iph = ip_hdr(skb);

	struct vif_device *vif = &mrt->vif_table[vifi];

	struct net_device *vif_dev;

	struct net_device *dev;

	struct rtable *rt;

	struct flowi4 fl4;

	int    encap = 0;
@@ -1898,8 +1897,6 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, 
			goto out_free;

	}



	dev = rt->dst.dev;



	if (skb->len+encap > dst_mtu(&rt->dst) && (ntohs(iph->frag_off) & IP_DF)) {

		/* Do not fragment multicasts. Alas, IPv4 does not

		 * allow to send ICMP, so that packets will disappear
@@ -1910,7 +1907,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, 
		goto out_free;

	}



	encap += LL_RESERVED_SPACE(dev) + rt->dst.header_len;

	encap += LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len;



	if (skb_cow(skb, encap)) {

		ip_rt_put(rt);
@@ -1947,7 +1944,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, 
	 * result in receiving multiple packets.

	 */

	NF_HOOK(NFPROTO_IPV4, NF_INET_FORWARD,

		net, NULL, skb, skb->dev, dev,

		net, NULL, skb, skb->dev, rt->dst.dev,

		ipmr_forward_finish);

	return;