xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
This commit is contained in:
David S. Miller
2012-07-19 11:17:30 -07:00
parent 67da22d23f 3e4b9459fb
commit abaa72d7fd
346 changed files with 3376 additions and 2221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/core/dev.c
View File

@@ -6313,7 +6313,8 @@ static struct hlist_head *netdev_create_hash(void)
/* Initialize per network namespace state */
static int __net_init netdev_init(struct net *net)
{
INIT_LIST_HEAD(&net->dev_base_head);
if (net != &init_net)
INIT_LIST_HEAD(&net->dev_base_head);
net->dev_name_head = netdev_create_hash();
if (net->dev_name_head == NULL)