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
2020
2121 struct j1939_session;
2222 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,
2626 };
2727
2828 /* j1939 devices */
net/can/j1939/socket.c+3−3
@@ -964,7 +964,7 @@ void j1939_sk_errqueue(struct j1939_session *session, · 963 unmodified lines
964964 serr = SKB_EXT_ERR(skb);
965965 memset(serr, 0, sizeof(*serr));
966966 switch (type) {
967− case J1939_ERRQUEUE_ACK:
967+ case J1939_ERRQUEUE_TX_ACK:
968968 if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK)) {
969969 kfree_skb(skb);
970970 return;
@@ -975,7 +975,7 @@ void j1939_sk_errqueue(struct j1939_session *session, · 4 unmodified lines
975975 serr->ee.ee_info = SCM_TSTAMP_ACK;
976976 state = "ACK";
977977 break;
978− case J1939_ERRQUEUE_SCHED:
978+ case J1939_ERRQUEUE_TX_SCHED:
979979 if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED)) {
980980 kfree_skb(skb);
981981 return;
@@ -986,7 +986,7 @@ void j1939_sk_errqueue(struct j1939_session *session, · 4 unmodified lines
986986 serr->ee.ee_info = SCM_TSTAMP_SCHED;
987987 state = "SCH";
988988 break;
989− case J1939_ERRQUEUE_ABORT:
989+ case J1939_ERRQUEUE_TX_ABORT:
990990 serr->ee.ee_errno = session->err;
991991 serr->ee.ee_origin = SO_EE_ORIGIN_LOCAL;
992992 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
261261 static void j1939_session_destroy(struct j1939_session *session)
262262 {
263263 if (session->err)
264− j1939_sk_errqueue(session, J1939_ERRQUEUE_ABORT);
264+ j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_ABORT);
265265 else
266− j1939_sk_errqueue(session, J1939_ERRQUEUE_ACK);
266+ j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_ACK);
267267
268268 netdev_dbg(session->priv->ndev, "%s: 0x%p\n", __func__, session);
269269
@@ -1044,7 +1044,7 @@ static int j1939_simple_txnext(struct j1939_session *session) · 774 unmodified lines
10441044 if (ret)
10451045 goto out_free;
10461046
1047− j1939_sk_errqueue(session, J1939_ERRQUEUE_SCHED);
1047+ j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_SCHED);
10481048 j1939_sk_queue_activate_next(session);
10491049
10501050 out_free:
@@ -1438,7 +1438,7 @@ j1939_xtp_rx_cts_one(struct j1939_session *session, struct sk_buff *skb) · 387 unmodified lines
14381438 if (session->transmission) {
14391439 if (session->pkt.tx_acked)
14401440 j1939_sk_errqueue(session,
1441− J1939_ERRQUEUE_SCHED);
1441+ J1939_ERRQUEUE_TX_SCHED);
14421442 j1939_session_txtimer_cancel(session);
14431443 j1939_tp_schedule_txtimer(session, 0);
14441444 }