[NETNS]: Consolidate hashes creation in netdev_init()

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index d16dcab..cc105ff 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1206,9 +1206,9 @@ int unregister_netdevice_notifier(struct notifier_block *nb)
  *     are as for raw_notifier_call_chain().
  */
 
-int call_netdevice_notifiers(unsigned long val, void *v)
+int call_netdevice_notifiers(unsigned long val, struct net_device *dev)
 {
-       return raw_notifier_call_chain(&netdev_chain, val, v);
+       return raw_notifier_call_chain(&netdev_chain, val, dev);
 }
 
 /* When > 0 there are consumers of rx skb time stamps */
@@ -1574,18 +1574,6 @@ out_kfree_skb:
        return 0;
 }
 
-#define HARD_TX_LOCK(dev, cpu) {                       \
-       if ((dev->features & NETIF_F_LLTX) == 0) {      \
-               netif_tx_lock(dev);                     \
-       }                                               \
-}
-
-#define HARD_TX_UNLOCK(dev) {                          \
-       if ((dev->features & NETIF_F_LLTX) == 0) {      \
-               netif_tx_unlock(dev);                   \
-       }                                               \
-}
-
 /**
  *     dev_queue_xmit - transmit a buffer
  *     @skb: buffer to transmit
@@ -2464,7 +2452,11 @@ static int dev_seq_open(struct inode *inode, struct file *file)
        res =  seq_open(file, &dev_seq_ops);
        if (!res) {
                seq = file->private_data;
-               seq->private = get_net(PROC_NET(inode));
+               seq->private = get_proc_net(inode);
+               if (!seq->private) {
+                       seq_release(inode, file);
+                       res = -ENXIO;
+               }
        }
        return res;
 }
@@ -4276,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_name_head = netdev_create_hash();
+       if (net->dev_name_head == NULL)
+               goto err_name;
 
-       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;
-       }
-
-       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)