|
@@ -318,8 +318,7 @@ static const struct rt6_info ip6_blk_hole_entry_template = {
|
|
|
/* allocate dst with ip6_dst_ops */
|
|
|
static struct rt6_info *__ip6_dst_alloc(struct net *net,
|
|
|
struct net_device *dev,
|
|
|
- int flags,
|
|
|
- struct fib6_table *table)
|
|
|
+ int flags)
|
|
|
{
|
|
|
struct rt6_info *rt = dst_alloc(&net->ipv6.ip6_dst_ops, dev,
|
|
|
0, DST_OBSOLETE_FORCE_CHK, flags);
|
|
@@ -336,10 +335,9 @@ static struct rt6_info *__ip6_dst_alloc(struct net *net,
|
|
|
|
|
|
static struct rt6_info *ip6_dst_alloc(struct net *net,
|
|
|
struct net_device *dev,
|
|
|
- int flags,
|
|
|
- struct fib6_table *table)
|
|
|
+ int flags)
|
|
|
{
|
|
|
- struct rt6_info *rt = __ip6_dst_alloc(net, dev, flags, table);
|
|
|
+ struct rt6_info *rt = __ip6_dst_alloc(net, dev, flags);
|
|
|
|
|
|
if (rt) {
|
|
|
rt->rt6i_pcpu = alloc_percpu_gfp(struct rt6_info *, GFP_ATOMIC);
|
|
@@ -950,8 +948,7 @@ static struct rt6_info *ip6_rt_cache_alloc(struct rt6_info *ort,
|
|
|
if (ort->rt6i_flags & (RTF_CACHE | RTF_PCPU))
|
|
|
ort = (struct rt6_info *)ort->dst.from;
|
|
|
|
|
|
- rt = __ip6_dst_alloc(dev_net(ort->dst.dev), ort->dst.dev,
|
|
|
- 0, ort->rt6i_table);
|
|
|
+ rt = __ip6_dst_alloc(dev_net(ort->dst.dev), ort->dst.dev, 0);
|
|
|
|
|
|
if (!rt)
|
|
|
return NULL;
|
|
@@ -983,8 +980,7 @@ static struct rt6_info *ip6_rt_pcpu_alloc(struct rt6_info *rt)
|
|
|
struct rt6_info *pcpu_rt;
|
|
|
|
|
|
pcpu_rt = __ip6_dst_alloc(dev_net(rt->dst.dev),
|
|
|
- rt->dst.dev, rt->dst.flags,
|
|
|
- rt->rt6i_table);
|
|
|
+ rt->dst.dev, rt->dst.flags);
|
|
|
|
|
|
if (!pcpu_rt)
|
|
|
return NULL;
|
|
@@ -1555,7 +1551,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
|
|
|
if (unlikely(!idev))
|
|
|
return ERR_PTR(-ENODEV);
|
|
|
|
|
|
- rt = ip6_dst_alloc(net, dev, 0, NULL);
|
|
|
+ rt = ip6_dst_alloc(net, dev, 0);
|
|
|
if (unlikely(!rt)) {
|
|
|
in6_dev_put(idev);
|
|
|
dst = ERR_PTR(-ENOMEM);
|
|
@@ -1742,7 +1738,8 @@ int ip6_route_add(struct fib6_config *cfg)
|
|
|
if (!table)
|
|
|
goto out;
|
|
|
|
|
|
- rt = ip6_dst_alloc(net, NULL, (cfg->fc_flags & RTF_ADDRCONF) ? 0 : DST_NOCOUNT, table);
|
|
|
+ rt = ip6_dst_alloc(net, NULL,
|
|
|
+ (cfg->fc_flags & RTF_ADDRCONF) ? 0 : DST_NOCOUNT);
|
|
|
|
|
|
if (!rt) {
|
|
|
err = -ENOMEM;
|
|
@@ -2399,7 +2396,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
|
|
|
{
|
|
|
struct net *net = dev_net(idev->dev);
|
|
|
struct rt6_info *rt = ip6_dst_alloc(net, net->loopback_dev,
|
|
|
- DST_NOCOUNT, NULL);
|
|
|
+ DST_NOCOUNT);
|
|
|
if (!rt)
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|