summaryrefslogtreecommitdiffstats
path: root/net/llc
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-05-25 15:08:59 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-17 21:26:02 -0700
commit29efcd2666b3a465b40aa07ef1f4d79847303e2f (patch)
tree6d1b3bb6543a24a6aa1a319adea20fbcea7b930a /net/llc
parentaecbd4e45c2e469e0452ffb2c0b0d881e2815bb8 (diff)
downloadlinux-stable-29efcd2666b3a465b40aa07ef1f4d79847303e2f.tar.gz
linux-stable-29efcd2666b3a465b40aa07ef1f4d79847303e2f.tar.bz2
linux-stable-29efcd2666b3a465b40aa07ef1f4d79847303e2f.zip
[LLC]: allow datagram recvmsg
LLC receive is broken for SOCK_DGRAM. If an application does recv() on a datagram socket and there is no data present, don't return "not connected". Instead, just do normal datagram semantics. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc')
-rw-r--r--net/llc/af_llc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 7465170a36ca..75c9b1480801 100644
--- a/net/llc/af_llc.c
+++ b/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