From 490c37f077ff9d3fac4586a854198f1318667339 Mon Sep 17 00:00:00 2001 From: Ursula Braun Date: Tue, 21 Apr 2009 06:04:20 +0000 Subject: [PATCH] --- yaml --- r: 143945 b: refs/heads/master c: bbe188c8f16effd902d1ad391e06e41ce649b22e h: refs/heads/master i: 143943: 83f4a16f69f8192bb8370a5f75f77bf6d75d1274 v: v3 --- [refs] | 2 +- trunk/net/iucv/af_iucv.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a9afd312fdaf..2dd416fa8c72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df833b1d73680f9f9dc72cbc3215edbbc6ab740d +refs/heads/master: bbe188c8f16effd902d1ad391e06e41ce649b22e diff --git a/trunk/net/iucv/af_iucv.c b/trunk/net/iucv/af_iucv.c index 49e786535dc8..2941ee50393b 100644 --- a/trunk/net/iucv/af_iucv.c +++ b/trunk/net/iucv/af_iucv.c @@ -172,6 +172,7 @@ static void iucv_sock_close(struct sock *sk) err = iucv_sock_wait_state(sk, IUCV_CLOSED, 0, timeo); } + case IUCV_CLOSING: /* fall through */ sk->sk_state = IUCV_CLOSED; sk->sk_state_change(sk); @@ -224,6 +225,8 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio) spin_lock_init(&iucv_sk(sk)->message_q.lock); skb_queue_head_init(&iucv_sk(sk)->backlog_skb_q); iucv_sk(sk)->send_tag = 0; + iucv_sk(sk)->path = NULL; + memset(&iucv_sk(sk)->src_user_id , 0, 32); sk->sk_destruct = iucv_sock_destruct; sk->sk_sndtimeo = IUCV_CONN_TIMEOUT;