Skip to content

Commit 78b77c7

Browse files
can: j1939: j1939_session_tx_dat(): use consistent name se_skcb for session skb control buffer
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 <[email protected]> Cc: Oleksij Rempel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent 7ac56e4 commit 78b77c7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

net/can/j1939/transport.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ static int j1939_session_tx_dpo(struct j1939_session *session)
776776
static int j1939_session_tx_dat(struct j1939_session *session)
777777
{
778778
struct j1939_priv *priv = session->priv;
779-
struct j1939_sk_buff_cb *skcb;
779+
struct j1939_sk_buff_cb *se_skcb;
780780
int offset, pkt_done, pkt_end;
781781
unsigned int len, pdelay;
782782
struct sk_buff *se_skb;
@@ -788,7 +788,7 @@ static int j1939_session_tx_dat(struct j1939_session *session)
788788
if (!se_skb)
789789
return -ENOBUFS;
790790

791-
skcb = j1939_skb_to_cb(se_skb);
791+
se_skcb = j1939_skb_to_cb(se_skb);
792792
tpdat = se_skb->data;
793793
ret = 0;
794794
pkt_done = 0;
@@ -800,15 +800,15 @@ static int j1939_session_tx_dat(struct j1939_session *session)
800800

801801
while (session->pkt.tx < pkt_end) {
802802
dat[0] = session->pkt.tx - session->pkt.dpo + 1;
803-
offset = (session->pkt.tx * 7) - skcb->offset;
803+
offset = (session->pkt.tx * 7) - se_skcb->offset;
804804
len = se_skb->len - offset;
805805
if (len > 7)
806806
len = 7;
807807

808808
if (offset + len > se_skb->len) {
809809
netdev_err_once(priv->ndev,
810810
"%s: 0x%p: requested data outside of queued buffer: offset %i, len %i, pkt.tx: %i\n",
811-
__func__, session, skcb->offset,
811+
__func__, session, se_skcb->offset,
812812
se_skb->len , session->pkt.tx);
813813
ret = -EOVERFLOW;
814814
goto out_free;

0 commit comments

Comments
 (0)