aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index f9faadb42485..a265f00b9df9 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -556,20 +556,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
556 return -EINVAL; 556 return -EINVAL;
557 557
558 slow = lock_sock_fast(sk); 558 slow = lock_sock_fast(sk);
559 if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) 559 answ = tcp_inq(sk);
560 answ = 0;
561 else if (sock_flag(sk, SOCK_URGINLINE) ||
562 !tp->urg_data ||
563 before(tp->urg_seq, tp->copied_seq) ||
564 !before(tp->urg_seq, tp->rcv_nxt)) {
565
566 answ = tp->rcv_nxt - tp->copied_seq;
567
568 /* Subtract 1, if FIN was received */
569 if (answ && sock_flag(sk, SOCK_DONE))
570 answ--;
571 } else
572 answ = tp->urg_seq - tp->copied_seq;
573 unlock_sock_fast(sk, slow); 560 unlock_sock_fast(sk, slow);
574 break; 561 break;
575 case SIOCATMARK: 562 case SIOCATMARK: