Skip to content

Commit

Permalink
[NETNS]: Consolidate hashes creation in netdev_init()
Browse files Browse the repository at this point in the history
The dev_name_hash and the dev_index_hash are now booth kmalloc-ed
(and each element is properly initialized as usually) so I think
it's worth consolidating this code making it look nicer (and
saving 28 bytes of .text section ;) )

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Oct 10, 2007
1 parent ad7379d commit 30d97d3
Showing 1 changed file with 24 additions and 17 deletions.
41 changes: 24 additions & 17 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -4268,32 +4268,39 @@ int netdev_compute_features(unsigned long all, unsigned long one)
}
EXPORT_SYMBOL(netdev_compute_features);

static struct hlist_head *netdev_create_hash(void)
{
int i;
struct hlist_head *hash;

hash = kmalloc(sizeof(*hash) * NETDEV_HASHENTRIES, GFP_KERNEL);
if (hash != NULL)
for (i = 0; i < NETDEV_HASHENTRIES; i++)
INIT_HLIST_HEAD(&hash[i]);

return hash;
}

/* Initialize per network namespace state */
static int netdev_init(struct net *net)
{
int i;
INIT_LIST_HEAD(&net->dev_base_head);
rwlock_init(&dev_base_lock);

net->dev_name_head = kmalloc(
sizeof(*net->dev_name_head)*NETDEV_HASHENTRIES, GFP_KERNEL);
if (!net->dev_name_head)
return -ENOMEM;

net->dev_index_head = kmalloc(
sizeof(*net->dev_index_head)*NETDEV_HASHENTRIES, GFP_KERNEL);
if (!net->dev_index_head) {
kfree(net->dev_name_head);
return -ENOMEM;
}
net->dev_name_head = netdev_create_hash();
if (net->dev_name_head == NULL)
goto err_name;

for (i = 0; i < NETDEV_HASHENTRIES; i++)
INIT_HLIST_HEAD(&net->dev_name_head[i]);

for (i = 0; i < NETDEV_HASHENTRIES; i++)
INIT_HLIST_HEAD(&net->dev_index_head[i]);
net->dev_index_head = netdev_create_hash();
if (net->dev_index_head == NULL)
goto err_idx;

return 0;

err_idx:
kfree(net->dev_name_head);
err_name:
return -ENOMEM;
}

static void netdev_exit(struct net *net)
Expand Down

0 comments on commit 30d97d3

Please sign in to comment.