shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_xmit()"

Browse Source 
This reverts commit 9b8f85c4d5 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 <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-01-11 07:07:25 +00:00
parent 5713068b26
commit 302342ed43
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/ip_tunnel.c
View File

@@ -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);