| @@ -76,16 +76,16 @@ static const char *ccid4_tx_state_name(e | #endif | | static void ccid4_hc_tx_set_state(struct sock *sk, | - enum ccid4_hc_tx_states state) | + enum tfrc_hc_tx_states state) | { | struct ccid4_hc_tx_sock *hctx = ccid4_hc_tx_sk(sk); | - enum ccid4_hc_tx_states oldstate = hctx->ccid4hctx_state; | + enum tfrc_hc_tx_states oldstate = hctx->tfrchctx_state; | | ccid4_pr_debug("%s(%p) %-8.8s -> %s\n", | dccp_role(sk), sk, ccid4_tx_state_name(oldstate), | ccid4_tx_state_name(state)); | WARN_ON(state == oldstate); | - hctx->ccid4hctx_state = state; | + hctx->tfrchctx_state = state; | } | I think this function is a candidate for sharing: no need to keep this function separate for CCID3/4 when both use the same enum of states; i.e. the function could be written tfrc_hc_tx_set_state(). - To unsubscribe from this list: send the line "unsubscribe dccp" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html