Commit 2d6c85ca authored by Guillaume Nault's avatar Guillaume Nault Committed by David S. Miller
Browse files

dccp: Set TOS and routing scope independently for fib lookups. 



There's no reason for setting the RTO_ONLINK flag in ->flowi4_tos as
RT_CONN_FLAGS() does. We can easily set ->flowi4_scope properly
instead. This makes the code more explicit and will allow to convert
->flowi4_tos to dscp_t in the future.

Signed-off-by: default avatarGuillaume Nault <gnault@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b16b5047

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,