From 11a2f6348b9be28ad2ac5b8f5f55bc03ca4d3741 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 11 Jan 2025 07:07:44 +0000 Subject: [PATCH] Revert "ipv4: ip_tunnel: Unmask upper DSCP bits in ip_md_tunnel_xmit()" This reverts commit d6ff1c86117a69c7007ebb11d5a01f7f5d4680a3 which is commit c34cfe72bb260fc49660d9e6a9ba95ba01669ae2 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: Id1deb68834b6b9756b96fd67ce3ec20a3c9f3321 Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_tunnel.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index eb74e33ffb64..d3ad2c424fe9 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -43,7 +43,6 @@ #include #include #include -#include #if IS_ENABLED(CONFIG_IPV6) #include @@ -610,9 +609,9 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, tos = ipv6_get_dsfield((const struct ipv6hdr *)inner_iph); } ip_tunnel_init_flow(&fl4, proto, key->u.ipv4.dst, key->u.ipv4.src, - tunnel_id_to_key32(key->tun_id), - tos & INET_DSCP_MASK, dev_net(dev), 0, skb->mark, - skb_get_hash(skb), key->flow_flags); + tunnel_id_to_key32(key->tun_id), RT_TOS(tos), + dev_net(dev), 0, skb->mark, skb_get_hash(skb), + key->flow_flags); if (!tunnel_hlen) tunnel_hlen = ip_encap_hlen(&tun_info->encap);