This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 24d6b1cf6e6aa39780df5e56365d551cd4f1db8e Author: p-szafonimateusz <[email protected]> AuthorDate: Mon Nov 9 11:51:10 2026 +0100 net/can: Rename can_conn.c to can.c. Rename can_conn.c to can.c with git mv, so that git log --follow and git blame keep the history. can.c becomes the protocol-independent CAN socket core in the next commits. No code change. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: p-szafonimateusz <[email protected]> --- .github/CODEOWNERS | 2 +- Documentation/os/networking/socketcan.rst | 2 +- net/can/CMakeLists.txt | 2 +- net/can/Make.defs | 2 +- net/can/{can_conn.c => can.c} | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f0bfe250474..a48267a5508 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -15890,9 +15890,9 @@ net/bluetooth/bluetooth_recvmsg.c [email protected] [email protected] wengz net/bluetooth/bluetooth_sendmsg.c [email protected] [email protected] [email protected] [email protected] [email protected] net/bluetooth/bluetooth_sockif.c [email protected] [email protected] [email protected] [email protected] net/can/Kconfig [email protected] [email protected] [email protected] [email protected] [email protected] +net/can/can.c [email protected] [email protected] [email protected] [email protected] [email protected] net/can/can.h [email protected] [email protected] [email protected] [email protected] [email protected] net/can/can_callback.c [email protected] [email protected] [email protected] [email protected] [email protected] -net/can/can_conn.c [email protected] [email protected] [email protected] [email protected] [email protected] net/can/can_getsockopt.c [email protected] [email protected] [email protected] [email protected] [email protected] net/can/can_input.c [email protected] [email protected] [email protected] [email protected] [email protected] net/can/can_notifier.c [email protected] [email protected] diff --git a/Documentation/os/networking/socketcan.rst b/Documentation/os/networking/socketcan.rst index 8e4136ad266..38315aac8a1 100644 --- a/Documentation/os/networking/socketcan.rst +++ b/Documentation/os/networking/socketcan.rst @@ -92,7 +92,7 @@ Files supporting SocketCAN can be found in the following locations: - **Header File**: ``include/nuttx/net/can.h`` - **Main Modules**: - - ``can_conn.c`` - Connection management + - ``can.c`` - Connection management - ``can_sockif.c`` - Socket interface implementation - ``can_sendmsg.c`` - Message transmission - ``can_sendmsg_buffered.c`` - Message transmission with buffering diff --git a/net/can/CMakeLists.txt b/net/can/CMakeLists.txt index 6c21d17195f..bcf4c54de3f 100644 --- a/net/can/CMakeLists.txt +++ b/net/can/CMakeLists.txt @@ -43,7 +43,7 @@ if(CONFIG_NET_CAN) list(APPEND SRCS can_bufpool.c) endif() - list(APPEND SRCS can_conn.c can_input.c can_callback.c can_poll.c) + list(APPEND SRCS can.c can_input.c can_callback.c can_poll.c) target_sources(net PRIVATE ${SRCS}) endif() diff --git a/net/can/Make.defs b/net/can/Make.defs index b1ffd4d048f..0a5c0e92084 100644 --- a/net/can/Make.defs +++ b/net/can/Make.defs @@ -49,7 +49,7 @@ SOCK_CSRCS += can_bufpool.c endif endif -NET_CSRCS += can_conn.c +NET_CSRCS += can.c NET_CSRCS += can_input.c NET_CSRCS += can_callback.c NET_CSRCS += can_poll.c diff --git a/net/can/can_conn.c b/net/can/can.c similarity index 99% rename from net/can/can_conn.c rename to net/can/can.c index 0312770a795..4d72db7c08c 100644 --- a/net/can/can_conn.c +++ b/net/can/can.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/can/can_conn.c + * net/can/can.c * * SPDX-License-Identifier: Apache-2.0 *
