| Message ID | 20250208115120.237274-2-mkl@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d0b197b6505fe3788860fc2a81b3ce53cbecc69c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,1/6] Documentation/networking: fix basic node example document ISO 15765-2 | expand |
Hello: This series was applied to netdev/net.git (main) by Marc Kleine-Budde <mkl@pengutronix.de>: On Sat, 8 Feb 2025 12:45:14 +0100 you wrote: > From: Reyders Morales <reyders1@gmail.com> > > In the current struct sockaddr_can tp is member of can_addr. tp is not > member of struct sockaddr_can. > > Signed-off-by: Reyders Morales <reyders1@gmail.com> > Reviewed-by: Simon Horman <horms@kernel.org> > Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> > Link: https://patch.msgid.link/20250203224720.42530-1-reyders1@gmail.com > Fixes: 67711e04254c ("Documentation: networking: document ISO 15765-2") > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > > [...] Here is the summary with links: - [net,1/6] Documentation/networking: fix basic node example document ISO 15765-2 https://git.kernel.org/netdev/net/c/d0b197b6505f - [net,2/6] can: j1939: j1939_sk_send_loop(): fix unable to send messages with data length zero https://git.kernel.org/netdev/net/c/44de577e61ed - [net,3/6] can: ctucanfd: handle skb allocation failure https://git.kernel.org/netdev/net/c/9bd24927e3ee - [net,4/6] can: c_can: fix unbalanced runtime PM disable in error path https://git.kernel.org/netdev/net/c/257a2cd3eb57 - [net,5/6] can: etas_es58x: fix potential NULL pointer dereference on udev->serial https://git.kernel.org/netdev/net/c/a1ad2109ce41 - [net,6/6] can: rockchip: rkcanfd_handle_rx_fifo_overflow_int(): bail out if skb cannot be allocated https://git.kernel.org/netdev/net/c/f7f0adfe64de You are awesome, thank you!
diff --git a/Documentation/networking/iso15765-2.rst b/Documentation/networking/iso15765-2.rst index 0e9d96074178..37ebb2c417cb 100644 --- a/Documentation/networking/iso15765-2.rst +++ b/Documentation/networking/iso15765-2.rst @@ -369,8 +369,8 @@ to their default. addr.can_family = AF_CAN; addr.can_ifindex = if_nametoindex("can0"); - addr.tp.tx_id = 0x18DA42F1 | CAN_EFF_FLAG; - addr.tp.rx_id = 0x18DAF142 | CAN_EFF_FLAG; + addr.can_addr.tp.tx_id = 0x18DA42F1 | CAN_EFF_FLAG; + addr.can_addr.tp.rx_id = 0x18DAF142 | CAN_EFF_FLAG; ret = bind(s, (struct sockaddr *)&addr, sizeof(addr)); if (ret < 0)