diff options
Diffstat (limited to 'net/x25/af_x25.c')
-rw-r--r-- | net/x25/af_x25.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 1d964e23853f..45a3ab5612c1 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
@@ -1583,11 +1583,11 @@ out_cud_release: | |||
1583 | case SIOCX25CALLACCPTAPPRV: { | 1583 | case SIOCX25CALLACCPTAPPRV: { |
1584 | rc = -EINVAL; | 1584 | rc = -EINVAL; |
1585 | lock_sock(sk); | 1585 | lock_sock(sk); |
1586 | if (sk->sk_state != TCP_CLOSE) | 1586 | if (sk->sk_state == TCP_CLOSE) { |
1587 | break; | 1587 | clear_bit(X25_ACCPT_APPRV_FLAG, &x25->flags); |
1588 | clear_bit(X25_ACCPT_APPRV_FLAG, &x25->flags); | 1588 | rc = 0; |
1589 | } | ||
1589 | release_sock(sk); | 1590 | release_sock(sk); |
1590 | rc = 0; | ||
1591 | break; | 1591 | break; |
1592 | } | 1592 | } |
1593 | 1593 | ||
@@ -1595,14 +1595,15 @@ out_cud_release: | |||
1595 | rc = -EINVAL; | 1595 | rc = -EINVAL; |
1596 | lock_sock(sk); | 1596 | lock_sock(sk); |
1597 | if (sk->sk_state != TCP_ESTABLISHED) | 1597 | if (sk->sk_state != TCP_ESTABLISHED) |
1598 | break; | 1598 | goto out_sendcallaccpt_release; |
1599 | /* must call accptapprv above */ | 1599 | /* must call accptapprv above */ |
1600 | if (test_bit(X25_ACCPT_APPRV_FLAG, &x25->flags)) | 1600 | if (test_bit(X25_ACCPT_APPRV_FLAG, &x25->flags)) |
1601 | break; | 1601 | goto out_sendcallaccpt_release; |
1602 | x25_write_internal(sk, X25_CALL_ACCEPTED); | 1602 | x25_write_internal(sk, X25_CALL_ACCEPTED); |
1603 | x25->state = X25_STATE_3; | 1603 | x25->state = X25_STATE_3; |
1604 | release_sock(sk); | ||
1605 | rc = 0; | 1604 | rc = 0; |
1605 | out_sendcallaccpt_release: | ||
1606 | release_sock(sk); | ||
1606 | break; | 1607 | break; |
1607 | } | 1608 | } |
1608 | 1609 | ||