Skip to content

Commit 2c77bcb

Browse files
Guillaume Naultkuba-moo
authored andcommitted
gre: Prepare ipgre_open() to .flowi4_tos conversion.
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 <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Link: https://patch.msgid.link/6c05a11afdc61530f1a4505147e0909ad51feb15.1736941806.git.gnault@redhat.com Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 2ee738e commit 2c77bcb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/ipv4/ip_gre.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ static int ipgre_open(struct net_device *dev)
926926
if (ipv4_is_multicast(t->parms.iph.daddr)) {
927927
struct flowi4 fl4 = {
928928
.flowi4_oif = t->parms.link,
929-
.flowi4_tos = t->parms.iph.tos & INET_DSCP_MASK,
929+
.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(&t->parms.iph)),
930930
.flowi4_scope = RT_SCOPE_UNIVERSE,
931931
.flowi4_proto = IPPROTO_GRE,
932932
.saddr = t->parms.iph.saddr,

0 commit comments

Comments
 (0)