diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-11-06 16:39:32 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-11-06 16:39:32 +0100 |
commit | f846ed7a8e32b6358ba968f8a0d9e428d9d36699 (patch) | |
tree | eea97f4c7987d69660f9c5dbd8a12fe7d195418a /net/unix/af_unix.c | |
parent | 7b724e6c828448ea82ba809204a53307cc235b0f (diff) | |
parent | d2ac742de047029bb44d0f1b7d4b01c35678a19a (diff) | |
download | lwn-f846ed7a8e32b6358ba968f8a0d9e428d9d36699.tar.gz lwn-f846ed7a8e32b6358ba968f8a0d9e428d9d36699.zip |
Merge branch 'rt/head' into rt/2.6.31
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 51ab497115eb..fc820cd75453 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1074,6 +1074,8 @@ restart: err = -ECONNREFUSED; if (other->sk_state != TCP_LISTEN) goto out_unlock; + if (other->sk_shutdown & RCV_SHUTDOWN) + goto out_unlock; if (unix_recvq_full(other)) { err = -EAGAIN; |