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/yellowfin.c
This commit is contained in:
David S. Miller
2009-09-02 00:32:56 -07:00
parent 0625491493 2fbd3da387
commit 6cdee2f96a
50 changed files with 389 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/llc/af_llc.c
View File

@@ -914,6 +914,7 @@ static int llc_ui_getname(struct socket *sock, struct sockaddr *uaddr,
struct llc_sock *llc = llc_sk(sk);
int rc = 0;
memset(&sllc, 0, sizeof(sllc));
lock_sock(sk);
if (sock_flag(sk, SOCK_ZAPPED))
goto out;