diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-05-01 12:09:36 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-01 12:09:36 -0400 |
| commit | 9908b3630f203e983ea02caf5f680ff18d8d82c4 (patch) | |
| tree | 2945708f1ade9682bea346649ebe30ca77b9c165 /include | |
| parent | Merge branch 'net-stmmac-dwmac-meson-100M-phy-mode-support-for-AXG-SoC' (diff) | |
| parent | sctp: add sctp_make_op_error_limited and reuse inner functions (diff) | |
Merge branch 'sctp-unify-sctp_make_op_error_fixed-and-sctp_make_op_error_space'
Marcelo Ricardo Leitner says:
====================
sctp: unify sctp_make_op_error_fixed and sctp_make_op_error_space
These two variants are very close to each other and can be merged
to avoid code duplication. That's what this patchset does.
First, we allow sctp_init_cause to return errors, which then allow us to
add sctp_make_op_error_limited that handles both situations.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sctp/sm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h index f4b657478a30..5ef1bad81ef5 100644 --- a/include/net/sctp/sm.h +++ b/include/net/sctp/sm.h @@ -215,7 +215,7 @@ struct sctp_chunk *sctp_make_shutdown_ack(const struct sctp_association *asoc, struct sctp_chunk *sctp_make_shutdown_complete( const struct sctp_association *asoc, const struct sctp_chunk *chunk); -void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause, size_t paylen); +int sctp_init_cause(struct sctp_chunk *chunk, __be16 cause, size_t paylen); struct sctp_chunk *sctp_make_abort(const struct sctp_association *asoc, const struct sctp_chunk *chunk, const size_t hint); |