[PATCH 0/1] Propose patch to fix build failure on net/can/j1919/transport.c

[PATCH 0/1] Propose patch to fix build failure on net/can/j1919/transport.c

[Stefan Mätje]

Hello Marc,

during my last kernel build from linux-can-next branch testing I encountered
a build failure. It seems to be related by one of your patches for J1939.

The attached patch fixes the build failure for me but as I don't know anything
about J1939 it may be wrong.

Best regards,
    Stefan Mätje

Stefan Mätje (1):
  can: j1939: j1939_session_tx_dat(): Fix build failure introduced by
    renaming skcb to se_skcb

 net/can/j1939/transport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.25.1

[PATCH 1/1] can: j1939: j1939_session_tx_dat(): Fix build failure introduced by renaming skcb to se_skcb

[Stefan Mätje]

The patch a2ea50608a02ac48371a9fab0167c1b44457913e renamed the
session skb control buffer from skcb to se_skcb. But that patch
missed one occurrence of skcb which leads to a build failure.

This patch renames also the last occurrence of skcb to fix it.

Signed-off-by: Stefan Mätje <Stefan.Maetje@esd.eu>
---
 net/can/j1939/transport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index 6c1d489c8ce2..efdf79de3db6 100644
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -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;
-- 
2.25.1

Re: [PATCH 1/1] can: j1939: j1939_session_tx_dat(): Fix build failure introduced by renaming skcb to se_skcb

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

On 16.07.2021 14:34:37, Stefan Mätje wrote:
> The patch a2ea50608a02ac48371a9fab0167c1b44457913e renamed the
> session skb control buffer from skcb to se_skcb. But that patch
> missed one occurrence of skcb which leads to a build failure.
> 
> This patch renames also the last occurrence of skcb to fix it.
> 
> Signed-off-by: Stefan Mätje <Stefan.Maetje@esd.eu>

Thanks, I've already fixed the here yesterday, but not pushed it yet.
Sorry for that.

Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH 1/1] can: j1939: j1939_session_tx_dat(): Fix build failure introduced by renaming skcb to se_skcb

[Stefan Mätje]

Am Freitag, den 16.07.2021, 14:36 +0200 schrieb Marc Kleine-Budde:
> On 16.07.2021 14:34:37, Stefan Mätje wrote:
> > The patch a2ea50608a02ac48371a9fab0167c1b44457913e renamed the
> > session skb control buffer from skcb to se_skcb. But that patch
> > missed one occurrence of skcb which leads to a build failure.
> > 
> > This patch renames also the last occurrence of skcb to fix it.
> > 
> > Signed-off-by: Stefan Mätje <Stefan.Maetje@esd.eu>
> 
> Thanks, I've already fixed the here yesterday, but not pushed it yet.
> Sorry for that.
> 
> Marc
> 
It's fine that it is fixed already. If you could push it now then I could easily
throw my patch away and start over.

Stefan

Re: [PATCH 1/1] can: j1939: j1939_session_tx_dat(): Fix build failure introduced by renaming skcb to se_skcb

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]

On 16.07.2021 12:45:17, Stefan Mätje wrote:
> Am Freitag, den 16.07.2021, 14:36 +0200 schrieb Marc Kleine-Budde:
> > On 16.07.2021 14:34:37, Stefan Mätje wrote:
> > > The patch a2ea50608a02ac48371a9fab0167c1b44457913e renamed the
> > > session skb control buffer from skcb to se_skcb. But that patch
> > > missed one occurrence of skcb which leads to a build failure.
> > > 
> > > This patch renames also the last occurrence of skcb to fix it.
> > > 
> > > Signed-off-by: Stefan Mätje <Stefan.Maetje@esd.eu>
> > 
> > Thanks, I've already fixed the here yesterday, but not pushed it yet.
> > Sorry for that.
> > 
> > Marc
> > 
> It's fine that it is fixed already. If you could push it now then I could easily
> throw my patch away and start over.

done - pushed to linux-can-next/testing

regards,
Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]