diff options
| author | Matthias May <matthias.may@westermo.com> | 2022-07-11 12:17:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-13 14:10:22 +0300 |
| commit | 3f8a8447fd0b0069236a417607b2e6cba30911ac (patch) | |
| tree | 30f01dd40749b3ef69a0911972efd1bd7ef895da /net/ipv6/ip6_gre.c | |
| parent | 41337f52b967b09a7a2cb34ecfce6dd71e5ab4f6 (diff) | |
| download | linux-3f8a8447fd0b0069236a417607b2e6cba30911ac.tar.xz | |
ip6_gre: use actual protocol to select xmit
When the payload is a VLAN encapsulated IPv6/IPv6 frame, we can
skip the 802.1q/802.1ad ethertypes and jump to the actual protocol.
This way we treat IPv4/IPv6 frames as IP instead of as "other".
Signed-off-by: Matthias May <matthias.may@westermo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index f0aeca609ab7..80cb50d459e4 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -916,6 +916,7 @@ static netdev_tx_t ip6gre_tunnel_xmit(struct sk_buff *skb, { struct ip6_tnl *t = netdev_priv(dev); struct net_device_stats *stats = &t->dev->stats; + __be16 payload_protocol; int ret; if (!pskb_inet_may_pull(skb)) @@ -924,7 +925,8 @@ static netdev_tx_t ip6gre_tunnel_xmit(struct sk_buff *skb, if (!ip6_tnl_xmit_ctl(t, &t->parms.laddr, &t->parms.raddr)) goto tx_err; - switch (skb->protocol) { + payload_protocol = skb_protocol(skb, true); + switch (payload_protocol) { case htons(ETH_P_IP): ret = ip6gre_xmit_ipv4(skb, dev); break; |