lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/tg3.c
This commit is contained in:
David S. Miller
2011-05-05 14:59:02 -07:00
parent 90864fbc76 87e9af6cc6
commit 7143b7d412
28 changed files with 170 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv6/addrconf.c
View File

@@ -4539,7 +4539,7 @@ static void __addrconf_sysctl_unregister(struct ipv6_devconf *p)
t = p->sysctl;
p->sysctl = NULL;
unregister_sysctl_table(t->sysctl_header);
unregister_net_sysctl_table(t->sysctl_header);
kfree(t->dev_name);
kfree(t);
}