Commit cd85d3ae authored by Oleksij Rempel's avatar Oleksij Rempel Committed by Marc Kleine-Budde
Browse files

can: j1939: rename J1939_ERRQUEUE_* to J1939_ERRQUEUE_TX_* 

Prepare the world for the J1939_ERRQUEUE_RX_ version

Link: https://lore.kernel.org/r/20210707094854.30781-2-o.rempel@pengutronix.de


Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent f8145cff

net/can/j1939/j1939-priv.h

+3 −3
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 


struct j1939_session;

enum j1939_sk_errqueue_type {

	J1939_ERRQUEUE_ACK,

	J1939_ERRQUEUE_SCHED,

	J1939_ERRQUEUE_ABORT,

	J1939_ERRQUEUE_TX_ACK,

	J1939_ERRQUEUE_TX_SCHED,

	J1939_ERRQUEUE_TX_ABORT,

};



/* j1939 devices */

net/can/j1939/socket.c

+3 −3
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ void j1939_sk_errqueue(struct j1939_session *session, 
	serr = SKB_EXT_ERR(skb);

	memset(serr, 0, sizeof(*serr));

	switch (type) {

	case J1939_ERRQUEUE_ACK:

	case J1939_ERRQUEUE_TX_ACK:

		if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK)) {

			kfree_skb(skb);

			return;
@@ -975,7 +975,7 @@ void j1939_sk_errqueue(struct j1939_session *session, 
		serr->ee.ee_info = SCM_TSTAMP_ACK;

		state = "ACK";

		break;

	case J1939_ERRQUEUE_SCHED:

	case J1939_ERRQUEUE_TX_SCHED:

		if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED)) {

			kfree_skb(skb);

			return;
@@ -986,7 +986,7 @@ void j1939_sk_errqueue(struct j1939_session *session, 
		serr->ee.ee_info = SCM_TSTAMP_SCHED;

		state = "SCH";

		break;

	case J1939_ERRQUEUE_ABORT:

	case J1939_ERRQUEUE_TX_ABORT:

		serr->ee.ee_errno = session->err;

		serr->ee.ee_origin = SO_EE_ORIGIN_LOCAL;

		serr->ee.ee_info = J1939_EE_INFO_TX_ABORT;

net/can/j1939/transport.c

+4 −4
Original line number Diff line number Diff line
@@ -261,9 +261,9 @@ static void __j1939_session_drop(struct j1939_session *session) 
static void j1939_session_destroy(struct j1939_session *session)

{

	if (session->err)

		j1939_sk_errqueue(session, J1939_ERRQUEUE_ABORT);

		j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_ABORT);

	else

		j1939_sk_errqueue(session, J1939_ERRQUEUE_ACK);

		j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_ACK);



	netdev_dbg(session->priv->ndev, "%s: 0x%p\n", __func__, session);
@@ -1044,7 +1044,7 @@ static int j1939_simple_txnext(struct j1939_session *session) 
	if (ret)

		goto out_free;



	j1939_sk_errqueue(session, J1939_ERRQUEUE_SCHED);

	j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_SCHED);

	j1939_sk_queue_activate_next(session);



 out_free:
@@ -1438,7 +1438,7 @@ j1939_xtp_rx_cts_one(struct j1939_session *session, struct sk_buff *skb) 
		if (session->transmission) {

			if (session->pkt.tx_acked)

				j1939_sk_errqueue(session,

						  J1939_ERRQUEUE_SCHED);

						  J1939_ERRQUEUE_TX_SCHED);

			j1939_session_txtimer_cancel(session);

			j1939_tp_schedule_txtimer(session, 0);

		}