diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-18 21:23:47 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-18 21:23:47 +0300 |
| commit | 3a3295bfa6f484bba91de0a804c1d0bf7d31dbd3 (patch) | |
| tree | 5e3af28184fb65447c9aaeffa51bfb95f473667a /include | |
| parent | 2d0f0ca2c7b56c1df29429dd5a768fc49e79ffae (diff) | |
| parent | cd305c74b0f8b49748a79a8f67fc8e5e3e0c4794 (diff) | |
| download | linux-3a3295bfa6f484bba91de0a804c1d0bf7d31dbd3.tar.xz | |
Merge branch 'sctp-fix-sk_wmem_queued-and-use-it-to-check-for-writable-space'
Xin Long says:
====================
sctp: fix sk_wmem_queued and use it to check for writable space
sctp doesn't count and use asoc sndbuf_used, sk sk_wmem_alloc and
sk_wmem_queued properly, which also causes some problem.
This patchset is to improve it.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sctp/constants.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h index 86f034b524d4..8dadc74c22e7 100644 --- a/include/net/sctp/constants.h +++ b/include/net/sctp/constants.h @@ -148,11 +148,6 @@ SCTP_SUBTYPE_CONSTRUCTOR(PRIMITIVE, enum sctp_event_primitive, primitive) #define sctp_chunk_is_data(a) (a->chunk_hdr->type == SCTP_CID_DATA || \ a->chunk_hdr->type == SCTP_CID_I_DATA) -/* Calculate the actual data size in a data chunk */ -#define SCTP_DATA_SNDSIZE(c) ((int)((unsigned long)(c->chunk_end) - \ - (unsigned long)(c->chunk_hdr) - \ - sctp_datachk_len(&c->asoc->stream))) - /* Internal error codes */ enum sctp_ierror { SCTP_IERROR_NO_ERROR = 0, |