diff options
| author | Tom Herbert <tom@herbertland.com> | 2016-03-07 14:11:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-09 16:36:14 -0500 |
| commit | 473bd239b808a8af5241ce9996a16d283d88ddff (patch) | |
| tree | 1a02155265887fa8e2893ddc144a656c240349ee /net/ipv4 | |
| parent | fa9835e52e3ea946916c2ce6c625c86421131740 (diff) | |
| download | blackbird-op-linux-473bd239b808a8af5241ce9996a16d283d88ddff.tar.gz blackbird-op-linux-473bd239b808a8af5241ce9996a16d283d88ddff.zip | |
tcp: Add tcp_inq to get available receive bytes on socket
Create a common kernel function to get the number of bytes available
on a TCP socket. This is based on code in INQ getsockopt and we now call
the function for that getsockopt.
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp.c | 15 |
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) return -EINVAL; slow = lock_sock_fast(sk); - if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) - answ = 0; - else if (sock_flag(sk, SOCK_URGINLINE) || - !tp->urg_data || - before(tp->urg_seq, tp->copied_seq) || - !before(tp->urg_seq, tp->rcv_nxt)) { - - answ = tp->rcv_nxt - tp->copied_seq; - - /* Subtract 1, if FIN was received */ - if (answ && sock_flag(sk, SOCK_DONE)) - answ--; - } else - answ = tp->urg_seq - tp->copied_seq; + answ = tcp_inq(sk); unlock_sock_fast(sk, slow); break; case SIOCATMARK: |
