]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
can: j1939: j1939_session_tx_dat(): use consistent name se_skcb for session skb contr...
authorMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 21 May 2021 08:04:29 +0000 (10:04 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Sun, 25 Jul 2021 09:36:25 +0000 (11:36 +0200)
This patch changes the name of the "skcb" variable in
j1939_session_tx_dat() to "se_skcb" as it's the session skb's control
buffer. The same name is used in other functions for the session skb's
control buffer.

Cc: Robin van der Gracht <robin@protonic.nl>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.kernel.org/r/20210616102811.2449426-5-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
net/can/j1939/transport.c

index 56c239698834139c27485388093c0a30a5fe3731..8de69c7681c4616da83d840b6444f8d821e3ff89 100644 (file)
@@ -776,7 +776,7 @@ static int j1939_session_tx_dpo(struct j1939_session *session)
 static int j1939_session_tx_dat(struct j1939_session *session)
 {
        struct j1939_priv *priv = session->priv;
-       struct j1939_sk_buff_cb *skcb;
+       struct j1939_sk_buff_cb *se_skcb;
        int offset, pkt_done, pkt_end;
        unsigned int len, pdelay;
        struct sk_buff *se_skb;
@@ -788,7 +788,7 @@ static int j1939_session_tx_dat(struct j1939_session *session)
        if (!se_skb)
                return -ENOBUFS;
 
-       skcb = j1939_skb_to_cb(se_skb);
+       se_skcb = j1939_skb_to_cb(se_skb);
        tpdat = se_skb->data;
        ret = 0;
        pkt_done = 0;
@@ -800,7 +800,7 @@ static int j1939_session_tx_dat(struct j1939_session *session)
 
        while (session->pkt.tx < pkt_end) {
                dat[0] = session->pkt.tx - session->pkt.dpo + 1;
-               offset = (session->pkt.tx * 7) - skcb->offset;
+               offset = (session->pkt.tx * 7) - se_skcb->offset;
                len =  se_skb->len - offset;
                if (len > 7)
                        len = 7;
@@ -808,7 +808,7 @@ static int j1939_session_tx_dat(struct j1939_session *session)
                if (offset + len > se_skb->len) {
                        netdev_err_once(priv->ndev,
                                        "%s: 0x%p: requested data outside of queued buffer: offset %i, len %i, pkt.tx: %i\n",
-                                       __func__, session, skcb->offset,
+                                       __func__, session, se_skcb->offset,
                                        se_skb->len , session->pkt.tx);
                        ret = -EOVERFLOW;
                        goto out_free;