mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: arch/microblaze/include/asm/socket.h
This commit is contained in:
commit
aa11d958d1
1599 changed files with 38098 additions and 25849 deletions
|
|
@ -520,6 +520,7 @@ static int econet_getname(struct socket *sock, struct sockaddr *uaddr,
|
|||
if (peer)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
memset(sec, 0, sizeof(*sec));
|
||||
mutex_lock(&econet_mutex);
|
||||
|
||||
sk = sock->sk;
|
||||
|
|
|
|||
Loading…
Reference in a new issue