diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-23 13:49:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-23 13:51:56 -0500 |
| commit | 5ca114400dcd46f19f31573e7c60e638bd8d644b (patch) | |
| tree | d78dc56c94548d865e505f022c08006716bdb963 /net/rds/tcp.c | |
| parent | f53d77e19b6587527a3dd60a0e638f115e5cd7a9 (diff) | |
| parent | a84a8ab94ed5cb65a1355fe9e8d1d55283375808 (diff) | |
| download | linux-5ca114400dcd46f19f31573e7c60e638bd8d644b.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.
The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/tcp.c')
| -rw-r--r-- | net/rds/tcp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 2e554ef6d75f..9920d2f84eff 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -90,9 +90,10 @@ void rds_tcp_nonagle(struct socket *sock) sizeof(val)); } -u32 rds_tcp_snd_nxt(struct rds_tcp_connection *tc) +u32 rds_tcp_write_seq(struct rds_tcp_connection *tc) { - return tcp_sk(tc->t_sock->sk)->snd_nxt; + /* seq# of the last byte of data in tcp send buffer */ + return tcp_sk(tc->t_sock->sk)->write_seq; } u32 rds_tcp_snd_una(struct rds_tcp_connection *tc) |