From: Oleksij Rempel <o.rempel@pengutronix.de>
To: dev.kurt@vandijck-laurijssen.be, mkl@pengutronix.de, wg@grandegger.com
Cc: Oleksij Rempel <o.rempel@pengutronix.de>,
kernel@pengutronix.de, linux-can@vger.kernel.org,
netdev@vger.kernel.org, David Jander <david@protonic.nl>,
Zhang Changzhong <zhangchangzhong@huawei.com>
Subject: [PATCH v1 1/2] net: j1939: rename J1939_ERRQUEUE_* to J1939_ERRQUEUE_TX_*
Date: Tue, 6 Jul 2021 13:57:57 +0200 [thread overview]
Message-ID: <20210706115758.11196-1-o.rempel@pengutronix.de> (raw)
Prepare the world for the J1939_ERRQUEUE_RX_ version
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
net/can/j1939/j1939-priv.h | 6 +++---
net/can/j1939/socket.c | 6 +++---
net/can/j1939/transport.c | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/net/can/j1939/j1939-priv.h b/net/can/j1939/j1939-priv.h
index 12369b604ce9..93b8ad7f7d04 100644
--- a/net/can/j1939/j1939-priv.h
+++ b/net/can/j1939/j1939-priv.h
@@ -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 */
diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c
index 56aa66147d5a..c2bf1c02597e 100644
--- a/net/can/j1939/socket.c
+++ b/net/can/j1939/socket.c
@@ -961,7 +961,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;
@@ -972,7 +972,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;
@@ -983,7 +983,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;
diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index e09d087ba240..362cf38cacca 100644
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -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);
@@ -1026,7 +1026,7 @@ static int j1939_simple_txnext(struct j1939_session *session)
if (ret)
return ret;
- j1939_sk_errqueue(session, J1939_ERRQUEUE_SCHED);
+ j1939_sk_errqueue(session, J1939_ERRQUEUE_TX_SCHED);
j1939_sk_queue_activate_next(session);
return 0;
@@ -1405,7 +1405,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);
}
--
2.30.2
next reply other threads:[~2021-07-06 12:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 11:57 Oleksij Rempel [this message]
2021-07-06 11:57 ` [PATCH v1 2/2] net: j1939: extend UAPI to notify about RX status Oleksij Rempel
2021-07-06 13:28 ` David Jander
2021-07-07 9:41 ` Oleksij Rempel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210706115758.11196-1-o.rempel@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=david@protonic.nl \
--cc=dev.kurt@vandijck-laurijssen.be \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=wg@grandegger.com \
--cc=zhangchangzhong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).