Commit 36395b2e authored Jul 19, 2023 by David S. Miller

Merge branch 'remove-RTO_ONLINK-users'



Guillaume Nault says:

====================
net: Remove more RTO_ONLINK users.

Code that initialise a flowi4 structure manually before doing a fib
lookup can easily avoid overloading ->flowi4_tos with the RTO_ONLINK
bit. They can just set ->flowi4_scope correctly instead.

Properly separating the routing scope from ->flowi4_tos will allow to
eventually convert this field to dscp_t (to ensure proper separation
between DSCP and ECN).
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 5861e822 ba80e20d

drivers/net/gtp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -243,7 +243,8 @@ static struct rtable ip4_route_output_gtp(struct flowi4 fl4,
		fl4->flowi4_oif = sk->sk_bound_dev_if;
		fl4->daddr = daddr;
		fl4->saddr = saddr;
		fl4->flowi4_tos = RT_CONN_FLAGS(sk);
		fl4->flowi4_tos = ip_sock_rt_tos(sk);
		fl4->flowi4_scope = ip_sock_rt_scope(sk);
		fl4->flowi4_proto = sk->sk_protocol;

		return ip_route_output_key(sock_net(sk), fl4);

net/dccp/ipv4.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -474,7 +474,8 @@ static struct dst_entry* dccp_v4_route_skb(struct net net, struct sock sk,
		.flowi4_oif = inet_iif(skb),
		.daddr = iph->saddr,
		.saddr = iph->daddr,
		.flowi4_tos = RT_CONN_FLAGS(sk),
		.flowi4_tos = ip_sock_rt_tos(sk),
		.flowi4_scope = ip_sock_rt_scope(sk),
		.flowi4_proto = sk->sk_protocol,
		.fl4_sport = dccp_hdr(skb)->dccph_dport,
		.fl4_dport = dccp_hdr(skb)->dccph_sport,

net/sctp/protocol.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -435,7 +435,8 @@ static void sctp_v4_get_dst(struct sctp_transport t, union sctp_addr saddr,
		fl4->fl4_dport = daddr->v4.sin_port;
		fl4->flowi4_proto = IPPROTO_SCTP;
		if (asoc) {
		fl4->flowi4_tos = RT_CONN_FLAGS_TOS(asoc->base.sk, tos);
		fl4->flowi4_tos = RT_TOS(tos);
		fl4->flowi4_scope = ip_sock_rt_scope(asoc->base.sk);
		fl4->flowi4_oif = asoc->base.sk->sk_bound_dev_if;
		fl4->fl4_sport = htons(asoc->base.bind_addr.port);
		}