leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ip_tunnels: allow VXLAN/GENEVE to inherit TOS/TTL from VLAN

Browse Source 
The current code allows for VXLAN and GENEVE to inherit the TOS
respective the TTL when skb-protocol is ETH_P_IP or ETH_P_IPV6.
However when the payload is VLAN encapsulated, then this inheriting
does not work, because the visible skb-protocol is of type
ETH_P_8021Q or ETH_P_8021AD.

Instead of skb->protocol use skb_protocol().

Signed-off-by: Matthias May <matthias.may@westermo.com>
Link: https://lore.kernel.org/r/20220721202718.10092-1-matthias.may@westermo.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Matthias May 2022-07-21 22:27:19 +02:00 committed by Jakub Kicinski
parent 7446b157fe
commit 7074732c8f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/net/ip_tunnels.h
View File

@ -387,9 +387,11 @@ static inline int ip_tunnel_encap(struct sk_buff *skb, struct ip_tunnel *t,
static inline u8 ip_tunnel_get_dsfield(const struct iphdr *iph, static inline u8 ip_tunnel_get_dsfield(const struct iphdr *iph,
const struct sk_buff *skb) const struct sk_buff *skb)
{ {
if (skb->protocol == htons(ETH_P_IP)) __be16 payload_protocol = skb_protocol(skb, true);
if (payload_protocol == htons(ETH_P_IP))
return iph->tos; return iph->tos;
else if (skb->protocol == htons(ETH_P_IPV6)) else if (payload_protocol == htons(ETH_P_IPV6))
return ipv6_get_dsfield((const struct ipv6hdr *)iph); return ipv6_get_dsfield((const struct ipv6hdr *)iph);
else else
return 0; return 0;
@ -398,9 +400,11 @@ static inline u8 ip_tunnel_get_dsfield(const struct iphdr *iph,
static inline u8 ip_tunnel_get_ttl(const struct iphdr *iph, static inline u8 ip_tunnel_get_ttl(const struct iphdr *iph,
const struct sk_buff *skb) const struct sk_buff *skb)
{ {
if (skb->protocol == htons(ETH_P_IP)) __be16 payload_protocol = skb_protocol(skb, true);
if (payload_protocol == htons(ETH_P_IP))
return iph->ttl; return iph->ttl;
else if (skb->protocol == htons(ETH_P_IPV6)) else if (payload_protocol == htons(ETH_P_IPV6))
return ((const struct ipv6hdr *)iph)->hop_limit; return ((const struct ipv6hdr *)iph)->hop_limit;
else else
return 0; return 0;