diff options
| author | Guillaume Nault <gnault@redhat.com> | 2022-04-21 01:21:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-22 14:06:03 +0200 |
| commit | 16a28267774cd9f85405ef83d4afcbd0355e5817 (patch) | |
| tree | da6c5a99699f82f3831eab7e8294ee3f7b4c0345 /net/ipv4 | |
| parent | Merge branch 'zynqmp-phy-config-optional' (diff) | |
| download | linux-16a28267774cd9f85405ef83d4afcbd0355e5817.tar.xz linux-16a28267774cd9f85405ef83d4afcbd0355e5817.zip | |
ipv4: Don't reset ->flowi4_scope in ip_rt_fix_tos().
All callers already initialise ->flowi4_scope with RT_SCOPE_UNIVERSE,
either by manual field assignment, memset(0) of the whole structure or
implicit structure initialisation of on-stack variables
(RT_SCOPE_UNIVERSE actually equals 0).
Therefore, we don't need to always initialise ->flowi4_scope in
ip_rt_fix_tos(). We only need to reduce the scope to RT_SCOPE_LINK when
the special RTO_ONLINK flag is present in the tos.
This will allow some code simplification, like removing
ip_rt_fix_tos(). Also, the long term idea is to remove RTO_ONLINK
entirely by properly initialising ->flowi4_scope, instead of
overloading ->flowi4_tos with a special flag. Eventually, this will
allow to convert ->flowi4_tos to dscp_t.
Signed-off-by: Guillaume Nault <gnault@redhat.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index e839d424b861..d8f82c0ac132 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -503,8 +503,8 @@ static void ip_rt_fix_tos(struct flowi4 *fl4) __u8 tos = RT_FL_TOS(fl4); fl4->flowi4_tos = tos & IPTOS_RT_MASK; - fl4->flowi4_scope = tos & RTO_ONLINK ? - RT_SCOPE_LINK : RT_SCOPE_UNIVERSE; + if (tos & RTO_ONLINK) + fl4->flowi4_scope = RT_SCOPE_LINK; } static void __build_flow_key(const struct net *net, struct flowi4 *fl4, |