diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 18:06:30 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 18:06:30 +0100 |
| commit | 56429e9b3be567a173bd05f5594faf8522c34d3a (patch) | |
| tree | d218d430ed992cdfa42da084bf36e5aa3c2ecb26 /net/irda/af_irda.c | |
| parent | nfsd: convert nfs4_file searches to use RCU (diff) | |
| parent | SUNRPC: Fix locking around callback channel reply receive (diff) | |
| download | linux-56429e9b3be567a173bd05f5594faf8522c34d3a.tar.xz linux-56429e9b3be567a173bd05f5594faf8522c34d3a.zip | |
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client
bugs that can interfere with my testing.
Diffstat (limited to 'net/irda/af_irda.c')
| -rw-r--r-- | net/irda/af_irda.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 92fafd485deb..3f3a6cbdceb7 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1064,8 +1064,6 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr, if (sk->sk_state != TCP_ESTABLISHED) { sock->state = SS_UNCONNECTED; - if (sk->sk_prot->disconnect(sk, flags)) - sock->state = SS_DISCONNECTING; err = sock_error(sk); if (!err) err = -ECONNRESET; |