Commit 148721f8 authored by Guillaume Nault's avatar Guillaume Nault Committed by Jakub Kicinski
Browse files

ipv4: Use inet_sk_init_flowi4() in __ip_queue_xmit(). 



Use inet_sk_init_flowi4() to automatically initialise the flowi4
structure in __ip_queue_xmit() instead of passing parameters manually
to ip_route_output_ports().

Override ->flowi4_tos with the value passed as parameter since that's
required by SCTP.

Signed-off-by: default avatarGuillaume Nault <gnault@redhat.com>
Link: https://patch.msgid.link/37e64ffbd9adac187b14aa9097b095f5c86e85be.1734357769.git.gnault@redhat.com


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

net/ipv4/ip_output.c

+4 −12
Original line number Diff line number Diff line
@@ -478,24 +478,16 @@ int __ip_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, 
	/* Make sure we can route this packet. */

	rt = dst_rtable(__sk_dst_check(sk, 0));

	if (!rt) {

		__be32 daddr;

		inet_sk_init_flowi4(inet, fl4);



		/* Use correct destination address if we have options. */

		daddr = inet->inet_daddr;

		if (inet_opt && inet_opt->opt.srr)

			daddr = inet_opt->opt.faddr;

		/* sctp_v4_xmit() uses its own DSCP value */

		fl4->flowi4_tos = tos & INET_DSCP_MASK;



		/* If this fails, retransmit mechanism of transport layer will

		 * keep trying until route appears or the connection times

		 * itself out.

		 */

		rt = ip_route_output_ports(net, fl4, sk,

					   daddr, inet->inet_saddr,

					   inet->inet_dport,

					   inet->inet_sport,

					   sk->sk_protocol,

					   tos & INET_DSCP_MASK,

					   sk->sk_bound_dev_if);

		rt = ip_route_output_flow(net, fl4, sk);

		if (IS_ERR(rt))

			goto no_route;

		sk_setup_caps(sk, &rt->dst);