From 9f595e4811503b06f89464c7e99ba294533f07de Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 25 May 2006 15:08:59 -0700 Subject: [PATCH] --- yaml --- r: 27500 b: refs/heads/master c: 29efcd2666b3a465b40aa07ef1f4d79847303e2f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/llc/af_llc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6e077c287661..34b85a9ed921 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aecbd4e45c2e469e0452ffb2c0b0d881e2815bb8 +refs/heads/master: 29efcd2666b3a465b40aa07ef1f4d79847303e2f diff --git a/trunk/net/llc/af_llc.c b/trunk/net/llc/af_llc.c index 7465170a36ca..75c9b1480801 100644 --- a/trunk/net/llc/af_llc.c +++ b/trunk/net/llc/af_llc.c @@ -674,7 +674,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, lock_sock(sk); copied = -ENOTCONN; - if (sk->sk_state == TCP_LISTEN) + if (unlikely(sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_LISTEN)) goto out; timeo = sock_rcvtimeo(sk, nonblock); @@ -733,7 +733,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, if (sk->sk_shutdown & RCV_SHUTDOWN) break; - if (sk->sk_state == TCP_CLOSE) { + if (sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_CLOSE) { if (!sock_flag(sk, SOCK_DONE)) { /* * This occurs when user tries to read