|
@@ -475,6 +475,7 @@ static void ipip6_tunnel_uninit(struct net_device *dev)
|
|
|
ipip6_tunnel_unlink(sitn, tunnel);
|
|
|
ipip6_tunnel_del_prl(tunnel, NULL);
|
|
|
}
|
|
|
+ ip_tunnel_dst_reset_all(tunnel);
|
|
|
dev_put(dev);
|
|
|
}
|
|
|
|
|
@@ -1082,6 +1083,7 @@ static void ipip6_tunnel_update(struct ip_tunnel *t, struct ip_tunnel_parm *p)
|
|
|
t->parms.link = p->link;
|
|
|
ipip6_tunnel_bind_dev(t->dev);
|
|
|
}
|
|
|
+ ip_tunnel_dst_reset_all(t);
|
|
|
netdev_state_change(t->dev);
|
|
|
}
|
|
|
|
|
@@ -1112,6 +1114,7 @@ static int ipip6_tunnel_update_6rd(struct ip_tunnel *t,
|
|
|
t->ip6rd.relay_prefix = relay_prefix;
|
|
|
t->ip6rd.prefixlen = ip6rd->prefixlen;
|
|
|
t->ip6rd.relay_prefixlen = ip6rd->relay_prefixlen;
|
|
|
+ ip_tunnel_dst_reset_all(t);
|
|
|
netdev_state_change(t->dev);
|
|
|
return 0;
|
|
|
}
|
|
@@ -1271,6 +1274,7 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
|
|
|
err = ipip6_tunnel_add_prl(t, &prl, cmd == SIOCCHGPRL);
|
|
|
break;
|
|
|
}
|
|
|
+ ip_tunnel_dst_reset_all(t);
|
|
|
netdev_state_change(dev);
|
|
|
break;
|
|
|
|
|
@@ -1326,6 +1330,9 @@ static const struct net_device_ops ipip6_netdev_ops = {
|
|
|
|
|
|
static void ipip6_dev_free(struct net_device *dev)
|
|
|
{
|
|
|
+ struct ip_tunnel *tunnel = netdev_priv(dev);
|
|
|
+
|
|
|
+ free_percpu(tunnel->dst_cache);
|
|
|
free_percpu(dev->tstats);
|
|
|
free_netdev(dev);
|
|
|
}
|
|
@@ -1375,6 +1382,12 @@ static int ipip6_tunnel_init(struct net_device *dev)
|
|
|
u64_stats_init(&ipip6_tunnel_stats->syncp);
|
|
|
}
|
|
|
|
|
|
+ tunnel->dst_cache = alloc_percpu(struct ip_tunnel_dst);
|
|
|
+ if (!tunnel->dst_cache) {
|
|
|
+ free_percpu(dev->tstats);
|
|
|
+ return -ENOMEM;
|
|
|
+ }
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -1405,6 +1418,12 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev)
|
|
|
u64_stats_init(&ipip6_fb_stats->syncp);
|
|
|
}
|
|
|
|
|
|
+ tunnel->dst_cache = alloc_percpu(struct ip_tunnel_dst);
|
|
|
+ if (!tunnel->dst_cache) {
|
|
|
+ free_percpu(dev->tstats);
|
|
|
+ return -ENOMEM;
|
|
|
+ }
|
|
|
+
|
|
|
dev_hold(dev);
|
|
|
rcu_assign_pointer(sitn->tunnels_wc[0], tunnel);
|
|
|
return 0;
|