diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/ip_vti.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 687ddef4e574..afcee51b90ed 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c | |||
@@ -337,6 +337,7 @@ static const struct net_device_ops vti_netdev_ops = { | |||
337 | static void vti_tunnel_setup(struct net_device *dev) | 337 | static void vti_tunnel_setup(struct net_device *dev) |
338 | { | 338 | { |
339 | dev->netdev_ops = &vti_netdev_ops; | 339 | dev->netdev_ops = &vti_netdev_ops; |
340 | dev->type = ARPHRD_TUNNEL; | ||
340 | ip_tunnel_setup(dev, vti_net_id); | 341 | ip_tunnel_setup(dev, vti_net_id); |
341 | } | 342 | } |
342 | 343 | ||
@@ -348,7 +349,6 @@ static int vti_tunnel_init(struct net_device *dev) | |||
348 | memcpy(dev->dev_addr, &iph->saddr, 4); | 349 | memcpy(dev->dev_addr, &iph->saddr, 4); |
349 | memcpy(dev->broadcast, &iph->daddr, 4); | 350 | memcpy(dev->broadcast, &iph->daddr, 4); |
350 | 351 | ||
351 | dev->type = ARPHRD_TUNNEL; | ||
352 | dev->hard_header_len = LL_MAX_HEADER + sizeof(struct iphdr); | 352 | dev->hard_header_len = LL_MAX_HEADER + sizeof(struct iphdr); |
353 | dev->mtu = ETH_DATA_LEN; | 353 | dev->mtu = ETH_DATA_LEN; |
354 | dev->flags = IFF_NOARP; | 354 | dev->flags = IFF_NOARP; |