aboutsummaryrefslogtreecommitdiff
path: root/net/llc
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-27 17:05:47 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 17:06:24 +0200
commit4152f93508b184a85a975810b2cc3dc5c597cf57 (patch)
tree19dff39aa185f18ed662ab5802d1e873aea5ab44 /net/llc
parent6effcd92454ca5d7021b74f89fcac75209e146f9 (diff)
parentfa84e9eecfff478df2d00e94deb3fc40fe4634ad (diff)
Merge branch 'sched/clock' into x86/cleanups
Reason: The tsc init cleanup depends on sched_clock_init moving past late_time_init. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/llc')
-rw-r--r--net/llc/af_llc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 9208cf5f2bd..c45eee1c0e8 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -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;