|
@@ -463,6 +463,7 @@ static const struct net_device_ops ipgre_netdev_ops = {
|
|
static void ipgre_tunnel_setup(struct net_device *dev)
|
|
static void ipgre_tunnel_setup(struct net_device *dev)
|
|
{
|
|
{
|
|
dev->netdev_ops = &ipgre_netdev_ops;
|
|
dev->netdev_ops = &ipgre_netdev_ops;
|
|
|
|
+ dev->type = ARPHRD_IPGRE;
|
|
ip_tunnel_setup(dev, ipgre_net_id);
|
|
ip_tunnel_setup(dev, ipgre_net_id);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -501,7 +502,6 @@ static int ipgre_tunnel_init(struct net_device *dev)
|
|
memcpy(dev->dev_addr, &iph->saddr, 4);
|
|
memcpy(dev->dev_addr, &iph->saddr, 4);
|
|
memcpy(dev->broadcast, &iph->daddr, 4);
|
|
memcpy(dev->broadcast, &iph->daddr, 4);
|
|
|
|
|
|
- dev->type = ARPHRD_IPGRE;
|
|
|
|
dev->flags = IFF_NOARP;
|
|
dev->flags = IFF_NOARP;
|
|
dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
|
|
dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
|
|
dev->addr_len = 4;
|
|
dev->addr_len = 4;
|