1 files changed, 6 insertions, 1 deletions

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 205a2b8a5a84..4cc84212cce1 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -398,7 +398,10 @@ static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi)
                                   iph->saddr, iph->daddr, tpi->key);
 
         if (tunnel) {
-                skb_pop_mac_header(skb);
+                if (tunnel->dev->type != ARPHRD_NONE)
+                        skb_pop_mac_header(skb);
+                else
+                        skb_reset_mac_header(skb);
                 if (tunnel->collect_md) {
                         __be16 flags;
                         __be64 tun_id;
@@ -1031,6 +1034,8 @@ static void ipgre_netlink_parms(struct net_device *dev,
                 struct ip_tunnel *t = netdev_priv(dev);
 
                 t->collect_md = true;
+                if (dev->type == ARPHRD_IPGRE)
+                        dev->type = ARPHRD_NONE;
         }
 }