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

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

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

7
net/ipv4/ip_tunnel.c
View File

@@ -43,7 +43,6 @@
#include <net/rtnetlink.h> #include <net/rtnetlink.h>
#include <net/udp.h> #include <net/udp.h>
#include <net/dst_metadata.h> #include <net/dst_metadata.h>
#include <net/inet_dscp.h>
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
#include <net/ipv6.h> #include <net/ipv6.h>
@@ -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); tos = ipv6_get_dsfield((const struct ipv6hdr *)inner_iph);
} }
ip_tunnel_init_flow(&fl4, proto, key->u.ipv4.dst, key->u.ipv4.src, ip_tunnel_init_flow(&fl4, proto, key->u.ipv4.dst, key->u.ipv4.src,
tunnel_id_to_key32(key->tun_id), tunnel_id_to_key32(key->tun_id), RT_TOS(tos),
tos & INET_DSCP_MASK, dev_net(dev), 0, skb->mark, dev_net(dev), 0, skb->mark, skb_get_hash(skb),
skb_get_hash(skb), key->flow_flags); key->flow_flags);
if (!tunnel_hlen) if (!tunnel_hlen)
tunnel_hlen = ip_encap_hlen(&tun_info->encap); tunnel_hlen = ip_encap_hlen(&tun_info->encap);