From: David S. Miller Date: Tue, 1 May 2018 16:09:36 +0000 (-0400) Subject: Merge branch 'sctp-unify-sctp_make_op_error_fixed-and-sctp_make_op_error_space' X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9908b3630f203e983ea02caf5f680ff18d8d82c4;p=openwrt%2Fstaging%2Fblogic.git 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 --- 9908b3630f203e983ea02caf5f680ff18d8d82c4