|
@@ -71,26 +71,25 @@ static int extend_netdev_table(struct net_device *dev, u32 new_len)
|
|
|
{
|
|
|
size_t new_size = sizeof(struct netprio_map) +
|
|
|
((sizeof(u32) * new_len));
|
|
|
- struct netprio_map *new_priomap = kzalloc(new_size, GFP_KERNEL);
|
|
|
- struct netprio_map *old_priomap;
|
|
|
+ struct netprio_map *new = kzalloc(new_size, GFP_KERNEL);
|
|
|
+ struct netprio_map *old;
|
|
|
|
|
|
- old_priomap = rtnl_dereference(dev->priomap);
|
|
|
+ old = rtnl_dereference(dev->priomap);
|
|
|
|
|
|
- if (!new_priomap) {
|
|
|
+ if (!new) {
|
|
|
pr_warn("Unable to alloc new priomap!\n");
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
- if (old_priomap)
|
|
|
- memcpy(new_priomap->priomap, old_priomap->priomap,
|
|
|
- old_priomap->priomap_len *
|
|
|
- sizeof(old_priomap->priomap[0]));
|
|
|
+ if (old)
|
|
|
+ memcpy(new->priomap, old->priomap,
|
|
|
+ old->priomap_len * sizeof(old->priomap[0]));
|
|
|
|
|
|
- new_priomap->priomap_len = new_len;
|
|
|
+ new->priomap_len = new_len;
|
|
|
|
|
|
- rcu_assign_pointer(dev->priomap, new_priomap);
|
|
|
- if (old_priomap)
|
|
|
- kfree_rcu(old_priomap, rcu);
|
|
|
+ rcu_assign_pointer(dev->priomap, new);
|
|
|
+ if (old)
|
|
|
+ kfree_rcu(old, rcu);
|
|
|
return 0;
|
|
|
}
|
|
|
|