diff options
-rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index ec4f762efda5..94213c891565 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
@@ -463,6 +463,7 @@ static const struct net_device_ops ipgre_netdev_ops = { | |||
463 | static void ipgre_tunnel_setup(struct net_device *dev) | 463 | static void ipgre_tunnel_setup(struct net_device *dev) |
464 | { | 464 | { |
465 | dev->netdev_ops = &ipgre_netdev_ops; | 465 | dev->netdev_ops = &ipgre_netdev_ops; |
466 | dev->type = ARPHRD_IPGRE; | ||
466 | ip_tunnel_setup(dev, ipgre_net_id); | 467 | ip_tunnel_setup(dev, ipgre_net_id); |
467 | } | 468 | } |
468 | 469 | ||
@@ -501,7 +502,6 @@ static int ipgre_tunnel_init(struct net_device *dev) | |||
501 | memcpy(dev->dev_addr, &iph->saddr, 4); | 502 | memcpy(dev->dev_addr, &iph->saddr, 4); |
502 | memcpy(dev->broadcast, &iph->daddr, 4); | 503 | memcpy(dev->broadcast, &iph->daddr, 4); |
503 | 504 | ||
504 | dev->type = ARPHRD_IPGRE; | ||
505 | dev->flags = IFF_NOARP; | 505 | dev->flags = IFF_NOARP; |
506 | dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; | 506 | dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; |
507 | dev->addr_len = 4; | 507 | dev->addr_len = 4; |