| Message ID | 6c05a11afdc61530f1a4505147e0909ad51feb15.1736941806.git.gnault@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] gre: Prepare ipgre_open() to .flowi4_tos conversion. | expand |
On Wed, Jan 15, 2025 at 12:53:55PM +0100, Guillaume Nault wrote: > Use ip4h_dscp() to get the tunnel DSCP option as dscp_t, instead of > manually masking the raw tos field with INET_DSCP_MASK. This will ease > the conversion of fl4->flowi4_tos to dscp_t, which just becomes a > matter of dropping the inet_dscp_to_dsfield() call. > > Signed-off-by: Guillaume Nault <gnault@redhat.com> Reviewed-by: Ido Schimmel <idosch@nvidia.com>
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index a020342f618d..ed1b6b44faf8 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -926,7 +926,7 @@ static int ipgre_open(struct net_device *dev) if (ipv4_is_multicast(t->parms.iph.daddr)) { struct flowi4 fl4 = { .flowi4_oif = t->parms.link, - .flowi4_tos = t->parms.iph.tos & INET_DSCP_MASK, + .flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(&t->parms.iph)), .flowi4_scope = RT_SCOPE_UNIVERSE, .flowi4_proto = IPPROTO_GRE, .saddr = t->parms.iph.saddr,
Use ip4h_dscp() to get the tunnel DSCP option as dscp_t, instead of manually masking the raw tos field with INET_DSCP_MASK. This will ease the conversion of fl4->flowi4_tos to dscp_t, which just becomes a matter of dropping the inet_dscp_to_dsfield() call. Signed-off-by: Guillaume Nault <gnault@redhat.com> --- net/ipv4/ip_gre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)