Revert "kernel: revert ip6_tunnel use skb_vlan_inet_prepare() in __ip6_tnl_rcv()"

This reverts commit ee0b160accecc397c124b8ddc356822be32a3320.

A backport commit was missing which was backported upstream with
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.71&id=4ce768ac429ec1c2d4ba63a408fed454ed12b248

Link: https://lore.kernel.org/all/CANn89iL5ksZZCJr7SK9=4Sw6EejdOzr5_m6pBMM8RVtbLy_ACA@mail.gmail.com/
Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22025
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/generic/hack-6.12/940-revert_ip6_tunnel_use_skb_vlan_inet_prepare.patch b/target/linux/generic/hack-6.12/940-revert_ip6_tunnel_use_skb_vlan_inet_prepare.patch
deleted file mode 100644 (file)
index da0c5e4..0000000
--- a/target/linux/generic/hack-6.12/940-revert_ip6_tunnel_use_skb_vlan_inet_prepare.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f4d02a22079cc198b26edd0efee5f50e5f3cf0e3 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Fri, 30 Jan 2026 13:34:20 +0100
-Subject: Revert "ip6_tunnel: use skb_vlan_inet_prepare() in __ip6_tnl_rcv()"
-
-This reverts commit df5ffde9669314500809bc498ae73d6d3d9519ac.
-
-This change broke the IPv6 tunneling stack (MAP-E and DS-Lite)
-
-Link: https://lists.openwall.net/netdev/2026/01/30/70
-Link: https://github.com/openwrt/openwrt/issues/21737
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- net/ipv6/ip6_tunnel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv6/ip6_tunnel.c
-+++ b/net/ipv6/ip6_tunnel.c
-@@ -970,7 +970,7 @@ static int __ip6_tnl_rcv(struct ip6_tnl
- 
-       skb_reset_network_header(skb);
- 
--      if (skb_vlan_inet_prepare(skb, true)) {
-+      if (!pskb_inet_may_pull(skb)) {
-               DEV_STATS_INC(tunnel->dev, rx_length_errors);
-               DEV_STATS_INC(tunnel->dev, rx_errors);
-               goto drop;