Merge tag 'socfpga_update_for_v5.5' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / net / ipv4 / ip_gre.c

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 10636fb6093e3cba09cfe6835077edb664e7244d..572b6307a2dff1a29c6686fb963aeb4a51410447 100644 (file)
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -340,6 +340,8 @@ static int __ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi,
                                  iph->saddr, iph->daddr, tpi->key);
 
        if (tunnel) {
+               const struct iphdr *tnl_params;
+
                if (__iptunnel_pull_header(skb, hdr_len, tpi->proto,
                                           raw_proto, false) < 0)
                        goto drop;
@@ -348,7 +350,9 @@ static int __ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi,
                        skb_pop_mac_header(skb);
                else
                        skb_reset_mac_header(skb);
-               if (tunnel->collect_md) {
+
+               tnl_params = &tunnel->parms.iph;
+               if (tunnel->collect_md || tnl_params->daddr == 0) {
                        __be16 flags;
                        __be64 tun_id;