tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

authored by

Oleksij Rempel and committed by
Marc Kleine-Budde cd85d3ae f8145cff

+10 -10
+3 -3
net/can/j1939/j1939-priv.h
··· 20 20 21 21 struct j1939_session; 22 22 enum j1939_sk_errqueue_type { 23 - J1939_ERRQUEUE_ACK, 24 - J1939_ERRQUEUE_SCHED, 25 - J1939_ERRQUEUE_ABORT, 23 + J1939_ERRQUEUE_TX_ACK, 24 + J1939_ERRQUEUE_TX_SCHED, 25 + J1939_ERRQUEUE_TX_ABORT, 26 26 }; 27 27 28 28 /* j1939 devices */
+3 -3
net/can/j1939/socket.c
··· 964 964 serr = SKB_EXT_ERR(skb); 965 965 memset(serr, 0, sizeof(*serr)); 966 966 switch (type) { 967 - case J1939_ERRQUEUE_ACK: 967 + case J1939_ERRQUEUE_TX_ACK: 968 968 if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK)) { 969 969 kfree_skb(skb); 970 970 return; ··· 975 975 serr->ee.ee_info = SCM_TSTAMP_ACK; 976 976 state = "ACK"; 977 977 break; 978 - case J1939_ERRQUEUE_SCHED: 978 + case J1939_ERRQUEUE_TX_SCHED: 979 979 if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED)) { 980 980 kfree_skb(skb); 981 981 return; ··· 986 986 serr->ee.ee_info = SCM_TSTAMP_SCHED; 987 987 state = "SCH"; 988 988 break; 989 - case J1939_ERRQUEUE_ABORT: 989 + case J1939_ERRQUEUE_TX_ABORT: 990 990 serr->ee.ee_errno = session->err; 991 991 serr->ee.ee_origin = SO_EE_ORIGIN_LOCAL; 992 992 serr->ee.ee_info = J1939_EE_INFO_TX_ABORT;
+4 -4
net/can/j1939/transport.c
··· 261 261 static void j1939_session_destroy(struct j1939_session *session) 262 262 { 263 263 if (session->err) 264 - j1939_sk_errqueue(session, J1939_ERRQUEUE_ABORT); 264 + j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_ABORT); 265 265 else 266 - j1939_sk_errqueue(session, J1939_ERRQUEUE_ACK); 266 + j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_ACK); 267 267 268 268 netdev_dbg(session->priv->ndev, "%s: 0x%p\n", __func__, session); 269 269 ··· 1044 1044 if (ret) 1045 1045 goto out_free; 1046 1046 1047 - j1939_sk_errqueue(session, J1939_ERRQUEUE_SCHED); 1047 + j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_SCHED); 1048 1048 j1939_sk_queue_activate_next(session); 1049 1049 1050 1050 out_free: ··· 1438 1438 if (session->transmission) { 1439 1439 if (session->pkt.tx_acked) 1440 1440 j1939_sk_errqueue(session, 1441 - J1939_ERRQUEUE_SCHED); 1441 + J1939_ERRQUEUE_TX_SCHED); 1442 1442 j1939_session_txtimer_cancel(session); 1443 1443 j1939_tp_schedule_txtimer(session, 0); 1444 1444 }