we have no more different path for send multi or send single. Signed-off-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx> --- net/can/j1939/j1939-priv.h | 2 +- net/can/j1939/socket.c | 6 +++--- net/can/j1939/transport.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/can/j1939/j1939-priv.h b/net/can/j1939/j1939-priv.h index b53e2ddd317e..de034dab0bc6 100644 --- a/net/can/j1939/j1939-priv.h +++ b/net/can/j1939/j1939-priv.h @@ -164,7 +164,7 @@ static inline struct j1939_sk_buff_cb *j1939_skb_to_cb(struct sk_buff *skb) int j1939_send_one(struct j1939_priv *priv, struct sk_buff *skb); void j1939_sk_recv(struct j1939_priv *priv, struct sk_buff *skb); -void j1939_sk_send_multi_abort(struct j1939_priv *priv, struct sock *sk, +void j1939_sk_send_loop_abort(struct j1939_priv *priv, struct sock *sk, int err); void j1939_sk_errqueue(struct j1939_session *session, enum j1939_sk_errqueue_type type); diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index 0aa6582f36c3..80ef2329c921 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c @@ -879,7 +879,7 @@ void j1939_sk_errqueue(struct j1939_session *session, kfree_skb(skb); }; -void j1939_sk_send_multi_abort(struct j1939_priv *priv, struct sock *sk, +void j1939_sk_send_loop_abort(struct j1939_priv *priv, struct sock *sk, int err) { sk->sk_err = err; @@ -887,7 +887,7 @@ void j1939_sk_send_multi_abort(struct j1939_priv *priv, struct sock *sk, sk->sk_error_report(sk); } -static int j1939_sk_send_multi(struct j1939_priv *priv, struct sock *sk, +static int j1939_sk_send_loop(struct j1939_priv *priv, struct sock *sk, struct msghdr *msg, size_t size) { @@ -1034,7 +1034,7 @@ static int j1939_sk_sendmsg(struct socket *sock, struct msghdr *msg, if (!priv) return -EINVAL; - ret = j1939_sk_send_multi(priv, sk, msg, size); + ret = j1939_sk_send_loop(priv, sk, msg, size); j1939_priv_put(priv); diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 16d42752f8f0..ade2937f57cf 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -876,7 +876,7 @@ static void j1939_session_cancel(struct j1939_session *session, err, session->skcb.addr.pgn); if (session->sk) - j1939_sk_send_multi_abort(priv, session->sk, session->err); + j1939_sk_send_loop_abort(priv, session->sk, session->err); } static enum hrtimer_restart j1939_tp_txtimer(struct hrtimer *hrtimer) @@ -987,7 +987,7 @@ static void j1939_xtp_rx_abort_one(struct j1939_priv *priv, struct sk_buff *skb, j1939_session_timers_cancel(session); session->err = j1939_xtp_abort_to_errno(priv, abort); if (session->sk) - j1939_sk_send_multi_abort(priv, session->sk, + j1939_sk_send_loop_abort(priv, session->sk, session->err); j1939_session_deactivate_activate_next(session); -- 2.20.1