netprio_cgroup: Remove update_netdev_tables() since it is unnecessary
authorSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Wed, 12 Sep 2012 20:32:25 +0000 (20:32 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Sep 2012 20:18:40 +0000 (16:18 -0400)
The update_netdev_tables() function appears to be unnecessary, since the
write_update_netdev_table() function will adjust the priomaps as and when
required anyway. So drop the usage of update_netdev_tables() entirely.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/netprio_cgroup.c

index c75e3f9d060f8e3d086b747255ab65c8104f7dde..fd339bb00106ba072c11592c2b34e1ecf9cb3872 100644 (file)
@@ -109,32 +109,6 @@ static int write_update_netdev_table(struct net_device *dev)
        return ret;
 }
 
-static int update_netdev_tables(void)
-{
-       int ret = 0;
-       struct net_device *dev;
-       u32 max_len;
-       struct netprio_map *map;
-
-       rtnl_lock();
-       max_len = atomic_read(&max_prioidx) + 1;
-       for_each_netdev(&init_net, dev) {
-               map = rtnl_dereference(dev->priomap);
-               /*
-                * don't allocate priomap if we didn't
-                * change net_prio.ifpriomap (map == NULL),
-                * this will speed up skb_update_prio.
-                */
-               if (map && map->priomap_len < max_len) {
-                       ret = extend_netdev_table(dev, max_len);
-                       if (ret < 0)
-                               break;
-               }
-       }
-       rtnl_unlock();
-       return ret;
-}
-
 static struct cgroup_subsys_state *cgrp_create(struct cgroup *cgrp)
 {
        struct cgroup_netprio_state *cs;
@@ -153,12 +127,6 @@ static struct cgroup_subsys_state *cgrp_create(struct cgroup *cgrp)
                goto out;
        }
 
-       ret = update_netdev_tables();
-       if (ret < 0) {
-               put_prioidx(cs->prioidx);
-               goto out;
-       }
-
        return &cs->css;
 out:
        kfree(cs);