From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
kernel@pengutronix.de, Oleksij Rempel <o.rempel@pengutronix.de>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH net-next 2/5] can: j1939: rename J1939_ERRQUEUE_* to J1939_ERRQUEUE_TX_*
Date: Wed, 4 Aug 2021 12:17:50 +0200 [thread overview]
Message-ID: <20210804101753.23826-3-mkl@pengutronix.de> (raw)
In-Reply-To: <20210804101753.23826-1-mkl@pengutronix.de>
From: Oleksij Rempel <o.rempel@pengutronix.de>
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>
---
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 b904c06ab0cf..6f3b10472f7f 100644
--- a/net/can/j1939/socket.c
+++ b/net/can/j1939/socket.c
@@ -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;
diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index a7f91db24f0e..801e700eaba6 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);
@@ -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);
}
--
2.30.2
next prev parent reply other threads:[~2021-08-04 10:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-04 10:17 pull-request: can-next 2021-08-04 Marc Kleine-Budde
2021-08-04 10:17 ` [PATCH net-next 1/5] can: j1939: j1939_session_tx_dat(): fix typo Marc Kleine-Budde
2021-08-04 10:17 ` Marc Kleine-Budde [this message]
2021-08-04 10:17 ` [PATCH net-next 3/5] can: j1939: extend UAPI to notify about RX status Marc Kleine-Budde
2021-08-04 10:17 ` [PATCH net-next 4/5] can: flexcan: flexcan_clks_enable(): add missing variable initialization Marc Kleine-Budde
2021-08-04 10:17 ` [PATCH net-next 5/5] dt-bindings: net: can: Document power-domains property Marc Kleine-Budde
2021-08-04 10:40 ` pull-request: can-next 2021-08-04 patchwork-bot+netdevbpf
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=20210804101753.23826-3-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=o.rempel@pengutronix.de \
/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