diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
| commit | abaa72d7fd9a20a67b62e6afa0e746e27851dc33 (patch) | |
| tree | ebe4134fcc93a6e205e6004b3e652d7a62281651 /net/core/dev.c | |
| parent | 67da22d23fa6f3324e03bcd0580b914b2e4afbf3 (diff) | |
| parent | 3e4b9459fb0e149c6b74c9e89399a8fc39a92b44 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 73e87c7b4377..d70e4a3a49f2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -6313,7 +6313,8 @@ static struct hlist_head *netdev_create_hash(void) | |||
| 6313 | /* Initialize per network namespace state */ | 6313 | /* Initialize per network namespace state */ |
| 6314 | static int __net_init netdev_init(struct net *net) | 6314 | static int __net_init netdev_init(struct net *net) |
| 6315 | { | 6315 | { |
| 6316 | INIT_LIST_HEAD(&net->dev_base_head); | 6316 | if (net != &init_net) |
| 6317 | INIT_LIST_HEAD(&net->dev_base_head); | ||
| 6317 | 6318 | ||
| 6318 | net->dev_name_head = netdev_create_hash(); | 6319 | net->dev_name_head = netdev_create_hash(); |
| 6319 | if (net->dev_name_head == NULL) | 6320 | if (net->dev_name_head == NULL) |