diff options
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | net/iucv/af_iucv.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cd123d0a6a2d..fa11fe773df5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15246,7 +15246,6 @@ F: drivers/iommu/s390-iommu.c S390 IUCV NETWORK LAYER M: Julian Wiedmann <[email protected]> M: Karsten Graul <[email protected]> -M: Ursula Braun <[email protected]> S: Supported W: http://www.ibm.com/developerworks/linux/linux390/ @@ -15257,7 +15256,6 @@ F: net/iucv/ S390 NETWORK DRIVERS M: Julian Wiedmann <[email protected]> M: Karsten Graul <[email protected]> -M: Ursula Braun <[email protected]> S: Supported W: http://www.ibm.com/developerworks/linux/linux390/ @@ -15828,7 +15826,6 @@ S: Maintained F: drivers/misc/sgi-xp/ SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS -M: Ursula Braun <[email protected]> M: Karsten Graul <[email protected]> S: Supported diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index d80572074667..047238f01ba6 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -1434,7 +1434,8 @@ static int iucv_sock_shutdown(struct socket *sock, int how) break; } - if (how == SEND_SHUTDOWN || how == SHUTDOWN_MASK) { + if ((how == SEND_SHUTDOWN || how == SHUTDOWN_MASK) && + sk->sk_state == IUCV_CONNECTED) { if (iucv->transport == AF_IUCV_TRANS_IUCV) { txmsg.class = 0; txmsg.tag = 0; |