History

can: j1939: rename J1939_ERRQUEUE_* to J1939_ERRQUEUE_TX_*

Prepare the world for the J1939_ERRQUEUE_RX_ version

Oleksij Rempel committed 5 years ago

Commit cd85d3a1 parent f8145cf3 files · +10 −10Browse files

Unified · Split

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