hulk inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/8859 -------------------------------- Adapt to the return value change of skb_vlan_inet_prepare() introduced by upstream commit f478b8239d65 ("net: tunnel: make skb_vlan_inet_prepare() return drop reasons"). This ensures the tunnel receive path handles packets correctly when VLAN/internet protocol preparation fails. Fixes: f478b8239d65 ("net: tunnel: make skb_vlan_inet_prepare() return drop reasons") Signed-off-by: Li Xiasong <lixiasong1@huawei.com> --- net/ipv6/ip6_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 8348b7e43c13..2d9a7fa13c5f 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -844,7 +844,7 @@ static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb, skb_reset_network_header(skb); - if (!skb_vlan_inet_prepare(skb, true)) { + if (skb_vlan_inet_prepare(skb, true)) { DEV_STATS_INC(tunnel->dev, rx_length_errors); DEV_STATS_INC(tunnel->dev, rx_errors); goto drop; -- 2.34.1