From 302342ed43ed63b24ee4583a8262772dbe263b10 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 11 Jan 2025 07:07:25 +0000 Subject: [PATCH] Revert "ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_xmit()" This reverts commit 9b8f85c4d5943a466afda164e15034013acf284d which is commit c2b639f9f3b7a058ca9c7349b096f355773f2cd8 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: Icf10739c4f21eebdf3d782ac44dc1bab179d6a8b Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 4f30ccf2d321..eb74e33ffb64 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -773,7 +773,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, } ip_tunnel_init_flow(&fl4, protocol, dst, tnl_params->saddr, - tunnel->parms.o_key, tos & INET_DSCP_MASK, + tunnel->parms.o_key, RT_TOS(tos), dev_net(dev), READ_ONCE(tunnel->parms.link), tunnel->fwmark, skb_get_hash(skb), 0);