mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
9c119ba54c
23 changed files with 292 additions and 280 deletions
|
|
@ -455,9 +455,14 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol,
|
|||
if (nl_table[protocol].registered &&
|
||||
try_module_get(nl_table[protocol].module))
|
||||
module = nl_table[protocol].module;
|
||||
else
|
||||
err = -EPROTONOSUPPORT;
|
||||
cb_mutex = nl_table[protocol].cb_mutex;
|
||||
netlink_unlock_table();
|
||||
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
||||
err = __netlink_create(net, sock, cb_mutex, protocol);
|
||||
if (err < 0)
|
||||
goto out_module;
|
||||
|
|
|
|||
Loading…
Reference in a new issue