diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-21 15:40:40 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-21 15:40:40 +0300 |
| commit | ef9a1618f95d32ac6abd4db42d9599a188ef3102 (patch) | |
| tree | 7e5c63656c35813ef044a298214456daaa8f8fc0 /include/net/ip_tunnels.h | |
| parent | 8a7a1920d72c87692665de214fdc5dc37e34e5cb (diff) | |
| parent | 9c5a72fbc90d829ffb761da64a73c23cd4e0503f (diff) | |
| download | linux-ef9a1618f95d32ac6abd4db42d9599a188ef3102.tar.xz | |
Merge v6.9.6
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/ip_tunnels.h')
| -rw-r--r-- | include/net/ip_tunnels.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index c286cc2e766e..cc666da62651 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -363,9 +363,10 @@ static inline bool pskb_inet_may_pull(struct sk_buff *skb) /* Variant of pskb_inet_may_pull(). */ -static inline bool skb_vlan_inet_prepare(struct sk_buff *skb) +static inline bool skb_vlan_inet_prepare(struct sk_buff *skb, + bool inner_proto_inherit) { - int nhlen = 0, maclen = ETH_HLEN; + int nhlen = 0, maclen = inner_proto_inherit ? 0 : ETH_HLEN; __be16 type = skb->protocol; /* Essentially this is skb_protocol(skb, true) |