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
The following commit(s) were added to refs/heads/master by this push:
new 2e202d7309f include/nuttx/net/net.h: add s_ prefix for node, list and
list_tail
2e202d7309f is described below
commit 2e202d7309ff163dd192190c21485d9321cb157b
Author: zhanghongyu <[email protected]>
AuthorDate: Wed Jan 7 15:57:29 2026 +0800
include/nuttx/net/net.h: add s_ prefix for node, list and list_tail
standardize the naming of structure members.
Signed-off-by: zhanghongyu <[email protected]>
---
include/nuttx/net/net.h | 6 +++---
net/bluetooth/bluetooth.h | 4 ++--
net/bluetooth/bluetooth_callback.c | 2 +-
net/bluetooth/bluetooth_conn.c | 8 ++++----
net/can/can.c | 8 ++++----
net/can/can.h | 4 ++--
net/icmp/icmp.h | 4 ++--
net/icmp/icmp_conn.c | 8 ++++----
net/icmp/icmp_input.c | 3 ++-
net/icmp/icmp_poll.c | 2 +-
net/icmpv6/icmpv6.h | 4 ++--
net/icmpv6/icmpv6_conn.c | 8 ++++----
net/icmpv6/icmpv6_input.c | 2 +-
net/icmpv6/icmpv6_poll.c | 2 +-
net/ieee802154/ieee802154.h | 4 ++--
net/ieee802154/ieee802154_callback.c | 2 +-
net/ieee802154/ieee802154_conn.c | 14 +++++++-------
net/local/local_conn.c | 6 +++---
net/netlink/netlink_conn.c | 6 +++---
net/pkt/pkt.h | 4 ++--
net/pkt/pkt_callback.c | 2 +-
net/pkt/pkt_conn.c | 9 +++++----
net/sixlowpan/sixlowpan_send.c | 8 ++++----
net/tcp/tcp.h | 4 ++--
net/tcp/tcp_callback.c | 2 +-
net/tcp/tcp_conn.c | 18 +++++++++---------
net/udp/udp.h | 4 ++--
net/udp/udp_callback.c | 2 +-
net/udp/udp_conn.c | 6 +++---
net/usrsock/usrsock_conn.c | 14 +++++++-------
net/usrsock/usrsock_event.c | 2 +-
net/usrsock/usrsock_poll.c | 7 ++++---
32 files changed, 91 insertions(+), 88 deletions(-)
diff --git a/include/nuttx/net/net.h b/include/nuttx/net/net.h
index cc4cd9d8619..0a78bc2c59e 100644
--- a/include/nuttx/net/net.h
+++ b/include/nuttx/net/net.h
@@ -197,14 +197,14 @@ struct socket_conn_s
{
/* Common prologue of all connection structures. */
- dq_entry_t node; /* Supports a doubly linked list */
+ dq_entry_t s_node; /* Supports a doubly linked list */
/* This is a list of connection callbacks. Each callback represents a
* thread that is stalled, waiting for a device-specific event.
*/
- FAR struct devif_callback_s *list;
- FAR struct devif_callback_s *list_tail;
+ FAR struct devif_callback_s *s_list;
+ FAR struct devif_callback_s *s_listtail;
/* This lock protects the connection structure. It is used to prevent
* re-entrance into the connection structure while it is being modified.
diff --git a/net/bluetooth/bluetooth.h b/net/bluetooth/bluetooth.h
index 7693fc9e9d3..4771110e7ec 100644
--- a/net/bluetooth/bluetooth.h
+++ b/net/bluetooth/bluetooth.h
@@ -46,9 +46,9 @@
/* Allocate a new Bluetooth socket data callback */
#define bluetooth_callback_alloc(dev,conn) \
- devif_callback_alloc(dev, &conn->bc_conn.list, &conn->bc_conn.list_tail)
+ devif_callback_alloc(dev, &conn->bc_conn.s_list, &conn->bc_conn.s_listtail)
#define bluetooth_callback_free(dev,conn,cb) \
- devif_conn_callback_free(dev, cb, &conn->bc_conn.list,
&conn->bc_conn.list_tail)
+ devif_conn_callback_free(dev, cb, &conn->bc_conn.s_list,
&conn->bc_conn.s_listtail)
/* Memory Pools */
diff --git a/net/bluetooth/bluetooth_callback.c
b/net/bluetooth/bluetooth_callback.c
index baea9d93919..d4d585fcdd5 100644
--- a/net/bluetooth/bluetooth_callback.c
+++ b/net/bluetooth/bluetooth_callback.c
@@ -73,7 +73,7 @@ uint32_t bluetooth_callback(FAR struct radio_driver_s *radio,
/* Perform the callback */
conn_lock(&conn->bc_conn);
- flags = devif_conn_event(&radio->r_dev, flags, conn->bc_conn.list);
+ flags = devif_conn_event(&radio->r_dev, flags, conn->bc_conn.s_list);
conn_unlock(&conn->bc_conn);
}
diff --git a/net/bluetooth/bluetooth_conn.c b/net/bluetooth/bluetooth_conn.c
index a86765ea0ce..08d943a4b10 100644
--- a/net/bluetooth/bluetooth_conn.c
+++ b/net/bluetooth/bluetooth_conn.c
@@ -115,7 +115,7 @@ FAR struct bluetooth_conn_s *bluetooth_conn_alloc(void)
/* Enqueue the connection into the active list */
- dq_addlast(&conn->bc_conn.node, &g_active_bluetooth_connections);
+ dq_addlast(&conn->bc_conn.s_node, &g_active_bluetooth_connections);
}
bluetooth_conn_list_unlock();
@@ -143,7 +143,7 @@ void bluetooth_conn_free(FAR struct bluetooth_conn_s *conn)
/* Remove the connection from the active list */
bluetooth_conn_list_lock();
- dq_rem(&conn->bc_conn.node, &g_active_bluetooth_connections);
+ dq_rem(&conn->bc_conn.s_node, &g_active_bluetooth_connections);
/* Check if there any any frames attached to the container */
@@ -197,7 +197,7 @@ FAR struct bluetooth_conn_s *
for (conn =
(FAR struct bluetooth_conn_s *)g_active_bluetooth_connections.head;
conn != NULL;
- conn = (FAR struct bluetooth_conn_s *)conn->bc_conn.node.flink)
+ conn = (FAR struct bluetooth_conn_s *)conn->bc_conn.s_node.flink)
{
/* match protocol and channel first */
@@ -264,7 +264,7 @@ FAR struct bluetooth_conn_s *
}
else
{
- return (FAR struct bluetooth_conn_s *)conn->bc_conn.node.flink;
+ return (FAR struct bluetooth_conn_s *)conn->bc_conn.s_node.flink;
}
}
diff --git a/net/can/can.c b/net/can/can.c
index 159a47083e8..551ab90fb2d 100644
--- a/net/can/can.c
+++ b/net/can/can.c
@@ -489,7 +489,7 @@ uint32_t can_callback(FAR struct net_driver_s *dev,
if (conn)
{
conn_lock(&conn->sconn);
- flags = devif_conn_event(dev, flags, conn->sconn.list);
+ flags = devif_conn_event(dev, flags, conn->sconn.s_list);
/* Either we did not get the lock or there is no application listening
* If we did not get a lock we store the frame in the read-ahead buffer
@@ -763,7 +763,7 @@ void can_conn_init(FAR struct can_conn_s *conn)
/* Enqueue the connection into the active list */
can_conn_list_lock();
- dq_addlast(&conn->sconn.node, &g_active_can_connections);
+ dq_addlast(&conn->sconn.s_node, &g_active_can_connections);
can_conn_list_unlock();
}
@@ -788,7 +788,7 @@ void can_conn_uninit(FAR struct can_conn_s *conn)
/* Remove the connection from the active list */
- dq_rem(&conn->sconn.node, &g_active_can_connections);
+ dq_rem(&conn->sconn.s_node, &g_active_can_connections);
nxrmutex_destroy(&conn->sconn.s_lock);
#ifdef CONFIG_NET_CAN_WRITE_BUFFERS
@@ -834,7 +834,7 @@ FAR struct can_conn_s *can_conn_next(FAR struct can_conn_s
*conn)
}
else
{
- return (FAR struct can_conn_s *)conn->sconn.node.flink;
+ return (FAR struct can_conn_s *)conn->sconn.s_node.flink;
}
}
diff --git a/net/can/can.h b/net/can/can.h
index c948f7771a9..952a1479dae 100644
--- a/net/can/can.h
+++ b/net/can/can.h
@@ -53,9 +53,9 @@
/* Allocate a new packet socket data callback */
#define can_callback_alloc(dev,conn) \
- devif_callback_alloc(dev, &conn->sconn.list, &conn->sconn.list_tail)
+ devif_callback_alloc(dev, &conn->sconn.s_list, &conn->sconn.s_listtail)
#define can_callback_free(dev,conn,cb) \
- devif_conn_callback_free(dev, cb, &conn->sconn.list, &conn->sconn.list_tail)
+ devif_conn_callback_free(dev, cb, &conn->sconn.s_list,
&conn->sconn.s_listtail)
#ifndef CONFIG_NET_CAN_NBUFFERS
# define CONFIG_NET_CAN_NBUFFERS 0
diff --git a/net/icmp/icmp.h b/net/icmp/icmp.h
index f6692dbe67e..b7a10aec185 100644
--- a/net/icmp/icmp.h
+++ b/net/icmp/icmp.h
@@ -50,9 +50,9 @@
/* Allocate/free an ICMP data callback */
#define icmp_callback_alloc(dev, conn) \
- devif_callback_alloc((dev), &(conn)->sconn.list, &(conn)->sconn.list_tail)
+ devif_callback_alloc((dev), &(conn)->sconn.s_list, &(conn)->sconn.s_listtail)
#define icmp_callback_free(dev, conn, cb) \
- devif_conn_callback_free((dev), (cb), &(conn)->sconn.list,
&(conn)->sconn.list_tail)
+ devif_conn_callback_free((dev), (cb), &(conn)->sconn.s_list,
&(conn)->sconn.s_listtail)
/****************************************************************************
* Public types
diff --git a/net/icmp/icmp_conn.c b/net/icmp/icmp_conn.c
index ec877d3eab1..5c5dd3e8cc3 100644
--- a/net/icmp/icmp_conn.c
+++ b/net/icmp/icmp_conn.c
@@ -94,7 +94,7 @@ FAR struct icmp_conn_s *icmp_alloc(void)
{
/* Enqueue the connection into the active list */
- dq_addlast(&conn->sconn.node, &g_active_icmp_connections);
+ dq_addlast(&conn->sconn.s_node, &g_active_icmp_connections);
}
NET_BUFPOOL_UNLOCK(g_icmp_connections);
@@ -127,7 +127,7 @@ void icmp_free(FAR struct icmp_conn_s *conn)
/* Remove the connection from the active list */
- dq_rem(&conn->sconn.node, &g_active_icmp_connections);
+ dq_rem(&conn->sconn.s_node, &g_active_icmp_connections);
nxrmutex_destroy(&conn->sconn.s_lock);
/* Free the connection. */
@@ -167,7 +167,7 @@ FAR struct icmp_conn_s *icmp_active(uint16_t id)
/* Look at the next active connection */
- conn = (FAR struct icmp_conn_s *)conn->sconn.node.flink;
+ conn = (FAR struct icmp_conn_s *)conn->sconn.s_node.flink;
}
return conn;
@@ -192,7 +192,7 @@ FAR struct icmp_conn_s *icmp_nextconn(FAR struct
icmp_conn_s *conn)
}
else
{
- return (FAR struct icmp_conn_s *)conn->sconn.node.flink;
+ return (FAR struct icmp_conn_s *)conn->sconn.s_node.flink;
}
}
diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c
index 2828747f6ce..e813a071fe4 100644
--- a/net/icmp/icmp_input.c
+++ b/net/icmp/icmp_input.c
@@ -211,7 +211,8 @@ static int icmp_delivery_callback(FAR struct icmp_conn_s
*conn,
}
info->delivered = true;
- if (devif_conn_event(dev, ICMP_NEWDATA, conn->sconn.list) == ICMP_NEWDATA)
+ if (devif_conn_event(dev, ICMP_NEWDATA, conn->sconn.s_list) ==
+ ICMP_NEWDATA)
{
icmp_datahandler(dev, conn, info->iphdrlen);
}
diff --git a/net/icmp/icmp_poll.c b/net/icmp/icmp_poll.c
index c0379b127fa..11be6c92ef5 100644
--- a/net/icmp/icmp_poll.c
+++ b/net/icmp/icmp_poll.c
@@ -73,7 +73,7 @@ void icmp_poll(FAR struct net_driver_s *dev, FAR struct
icmp_conn_s *conn)
/* Perform the application callback */
- devif_conn_event(dev, ICMP_POLL, conn->sconn.list);
+ devif_conn_event(dev, ICMP_POLL, conn->sconn.s_list);
}
#endif /* CONFIG_NET && CONFIG_NET_ICMP && CONFIG_NET_ICMP_SOCKET */
diff --git a/net/icmpv6/icmpv6.h b/net/icmpv6/icmpv6.h
index b50cd35892c..b08cb0791c9 100644
--- a/net/icmpv6/icmpv6.h
+++ b/net/icmpv6/icmpv6.h
@@ -51,9 +51,9 @@
/* Allocate a new ICMPv6 data callback */
#define icmpv6_callback_alloc(dev, conn) \
- devif_callback_alloc((dev), &(conn)->sconn.list, &(conn)->sconn.list_tail)
+ devif_callback_alloc((dev), &(conn)->sconn.s_list, &(conn)->sconn.s_listtail)
#define icmpv6_callback_free(dev, conn, cb) \
- devif_conn_callback_free((dev), (cb), &(conn)->sconn.list,
&(conn)->sconn.list_tail)
+ devif_conn_callback_free((dev), (cb), &(conn)->sconn.s_list,
&(conn)->sconn.s_listtail)
/****************************************************************************
* Public Type Definitions
diff --git a/net/icmpv6/icmpv6_conn.c b/net/icmpv6/icmpv6_conn.c
index 544e012d464..63114f1f112 100644
--- a/net/icmpv6/icmpv6_conn.c
+++ b/net/icmpv6/icmpv6_conn.c
@@ -95,7 +95,7 @@ FAR struct icmpv6_conn_s *icmpv6_alloc(void)
{
/* Enqueue the connection into the active list */
- dq_addlast(&conn->sconn.node, &g_active_icmpv6_connections);
+ dq_addlast(&conn->sconn.s_node, &g_active_icmpv6_connections);
}
NET_BUFPOOL_UNLOCK(g_icmpv6_connections);
@@ -124,7 +124,7 @@ void icmpv6_free(FAR struct icmpv6_conn_s *conn)
/* Remove the connection from the active list */
- dq_rem(&conn->sconn.node, &g_active_icmpv6_connections);
+ dq_rem(&conn->sconn.s_node, &g_active_icmpv6_connections);
nxrmutex_destroy(&conn->sconn.s_lock);
/* Free the connection. */
@@ -164,7 +164,7 @@ FAR struct icmpv6_conn_s *icmpv6_active(uint16_t id)
/* Look at the next active connection */
- conn = (FAR struct icmpv6_conn_s *)conn->sconn.node.flink;
+ conn = (FAR struct icmpv6_conn_s *)conn->sconn.s_node.flink;
}
return conn;
@@ -189,7 +189,7 @@ FAR struct icmpv6_conn_s *icmpv6_nextconn(FAR struct
icmpv6_conn_s *conn)
}
else
{
- return (FAR struct icmpv6_conn_s *)conn->sconn.node.flink;
+ return (FAR struct icmpv6_conn_s *)conn->sconn.s_node.flink;
}
}
diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c
index b083b035364..4603760e557 100644
--- a/net/icmpv6/icmpv6_input.c
+++ b/net/icmpv6/icmpv6_input.c
@@ -201,7 +201,7 @@ static int icmpv6_delivery_callback(FAR struct
icmpv6_conn_s *conn,
}
info->delivered = true;
- if (devif_conn_event(dev, ICMPv6_NEWDATA, conn->sconn.list) !=
+ if (devif_conn_event(dev, ICMPv6_NEWDATA, conn->sconn.s_list) !=
ICMPv6_NEWDATA)
{
dev->d_len = dev->d_iob->io_pktlen;
diff --git a/net/icmpv6/icmpv6_poll.c b/net/icmpv6/icmpv6_poll.c
index 91c05d4cbc0..dc0c981ba80 100644
--- a/net/icmpv6/icmpv6_poll.c
+++ b/net/icmpv6/icmpv6_poll.c
@@ -76,7 +76,7 @@ void icmpv6_poll(FAR struct net_driver_s *dev,
if (conn != NULL)
{
DEBUGASSERT(dev == conn->dev);
- list = conn->sconn.list;
+ list = conn->sconn.s_list;
}
#endif
diff --git a/net/ieee802154/ieee802154.h b/net/ieee802154/ieee802154.h
index ae3b1c74bfc..037d9c967d5 100644
--- a/net/ieee802154/ieee802154.h
+++ b/net/ieee802154/ieee802154.h
@@ -44,9 +44,9 @@
/* Allocate a new IEEE 802.15.4 socket data callback */
#define ieee802154_callback_alloc(dev,conn) \
- devif_callback_alloc(dev, &conn->sconn.list, &conn->sconn.list_tail)
+ devif_callback_alloc(dev, &conn->sconn.s_list, &conn->sconn.s_listtail)
#define ieee802154_callback_free(dev,conn,cb) \
- devif_conn_callback_free(dev, cb, &conn->sconn.list, &conn->sconn.list_tail)
+ devif_conn_callback_free(dev, cb, &conn->sconn.s_list,
&conn->sconn.s_listtail)
/* Memory Pools */
diff --git a/net/ieee802154/ieee802154_callback.c
b/net/ieee802154/ieee802154_callback.c
index 27ae17eca5a..257d5d7d2d2 100644
--- a/net/ieee802154/ieee802154_callback.c
+++ b/net/ieee802154/ieee802154_callback.c
@@ -69,7 +69,7 @@ uint32_t ieee802154_callback(FAR struct radio_driver_s *radio,
/* Perform the callback */
conn_lock(&conn->sconn);
- flags = devif_conn_event(&radio->r_dev, flags, conn->sconn.list);
+ flags = devif_conn_event(&radio->r_dev, flags, conn->sconn.s_list);
conn_unlock(&conn->sconn);
}
diff --git a/net/ieee802154/ieee802154_conn.c b/net/ieee802154/ieee802154_conn.c
index f416b9378b0..44fa1046c5f 100644
--- a/net/ieee802154/ieee802154_conn.c
+++ b/net/ieee802154/ieee802154_conn.c
@@ -104,7 +104,7 @@ FAR struct ieee802154_conn_s *ieee802154_conn_alloc(void)
conn = NET_BUFPOOL_TRYALLOC(g_ieee802154_connections);
if (conn)
{
- dq_addlast(&conn->sconn.node, &g_active_ieee802154_connections);
+ dq_addlast(&conn->sconn.s_node, &g_active_ieee802154_connections);
}
ieee802154_conn_list_unlock();
@@ -132,7 +132,7 @@ void ieee802154_conn_free(FAR struct ieee802154_conn_s
*conn)
/* Remove the connection from the active list */
ieee802154_conn_list_lock();
- dq_rem(&conn->sconn.node, &g_active_ieee802154_connections);
+ dq_rem(&conn->sconn.s_node, &g_active_ieee802154_connections);
/* Check if there any any frames attached to the container */
@@ -184,7 +184,7 @@ FAR struct ieee802154_conn_s *
for (conn = (FAR struct ieee802154_conn_s *)
g_active_ieee802154_connections.head;
conn != NULL;
- conn = (FAR struct ieee802154_conn_s *)conn->sconn.node.flink)
+ conn = (FAR struct ieee802154_conn_s *)conn->sconn.s_node.flink)
{
/* Does the destination address match the bound address of the socket.
*
@@ -232,9 +232,9 @@ FAR struct ieee802154_conn_s *
}
break;
- default:
- nerr("ERROR: Invalid address mode: %u\n", conn->raddr.s_mode);
- return NULL;
+ default:
+ nerr("ERROR: Invalid address mode: %u\n", conn->raddr.s_mode);
+ return NULL;
}
}
@@ -262,7 +262,7 @@ FAR struct ieee802154_conn_s *
}
else
{
- return (FAR struct ieee802154_conn_s *)conn->sconn.node.flink;
+ return (FAR struct ieee802154_conn_s *)conn->sconn.s_node.flink;
}
}
diff --git a/net/local/local_conn.c b/net/local/local_conn.c
index 78789d3eac6..8a889ae7c99 100644
--- a/net/local/local_conn.c
+++ b/net/local/local_conn.c
@@ -76,7 +76,7 @@ FAR struct local_conn_s *local_nextconn(FAR struct
local_conn_s *conn)
return (FAR struct local_conn_s *)g_local_connections.head;
}
- return (FAR struct local_conn_s *)conn->lc_conn.node.flink;
+ return (FAR struct local_conn_s *)conn->lc_conn.s_node.flink;
}
/****************************************************************************
@@ -187,7 +187,7 @@ FAR struct local_conn_s *local_alloc(void)
/* Add the connection structure to the list of listeners */
- dq_addlast(&conn->lc_conn.node, &g_local_connections);
+ dq_addlast(&conn->lc_conn.s_node, &g_local_connections);
}
return conn;
@@ -308,7 +308,7 @@ void local_free(FAR struct local_conn_s *conn)
/* Remove the server from the list of listeners. */
- dq_rem(&conn->lc_conn.node, &g_local_connections);
+ dq_rem(&conn->lc_conn.s_node, &g_local_connections);
if (conn->lc_peer)
{
diff --git a/net/netlink/netlink_conn.c b/net/netlink/netlink_conn.c
index 1d665a40b3c..bd1e8401c3e 100644
--- a/net/netlink/netlink_conn.c
+++ b/net/netlink/netlink_conn.c
@@ -164,7 +164,7 @@ FAR struct netlink_conn_s *netlink_alloc(void)
{
/* Enqueue the connection into the active list */
- dq_addlast(&conn->sconn.node, &g_active_netlink_connections);
+ dq_addlast(&conn->sconn.s_node, &g_active_netlink_connections);
}
NET_BUFPOOL_UNLOCK(g_netlink_connections);
@@ -192,7 +192,7 @@ void netlink_free(FAR struct netlink_conn_s *conn)
/* Remove the connection from the active list */
- dq_rem(&conn->sconn.node, &g_active_netlink_connections);
+ dq_rem(&conn->sconn.s_node, &g_active_netlink_connections);
/* Free any unclaimed responses */
@@ -227,7 +227,7 @@ FAR struct netlink_conn_s *netlink_nextconn(FAR struct
netlink_conn_s *conn)
}
else
{
- return (FAR struct netlink_conn_s *)conn->sconn.node.flink;
+ return (FAR struct netlink_conn_s *)conn->sconn.s_node.flink;
}
}
diff --git a/net/pkt/pkt.h b/net/pkt/pkt.h
index 527edb06dd5..9c7ad1b3591 100644
--- a/net/pkt/pkt.h
+++ b/net/pkt/pkt.h
@@ -42,9 +42,9 @@
/* Allocate a new packet socket data callback */
#define pkt_callback_alloc(dev,conn) \
- devif_callback_alloc(dev, &conn->sconn.list, &conn->sconn.list_tail)
+ devif_callback_alloc(dev, &conn->sconn.s_list, &conn->sconn.s_listtail)
#define pkt_callback_free(dev,conn,cb) \
- devif_conn_callback_free(dev, cb, &conn->sconn.list, &conn->sconn.list_tail)
+ devif_conn_callback_free(dev, cb, &conn->sconn.s_list,
&conn->sconn.s_listtail)
/****************************************************************************
* Public Type Definitions
diff --git a/net/pkt/pkt_callback.c b/net/pkt/pkt_callback.c
index d9c0acac5ad..59c19e4b6d0 100644
--- a/net/pkt/pkt_callback.c
+++ b/net/pkt/pkt_callback.c
@@ -67,7 +67,7 @@ uint32_t pkt_callback(FAR struct net_driver_s *dev,
/* Perform the callback */
conn_lock(&conn->sconn);
- flags = devif_conn_event(dev, flags, conn->sconn.list);
+ flags = devif_conn_event(dev, flags, conn->sconn.s_list);
conn_unlock(&conn->sconn);
}
diff --git a/net/pkt/pkt_conn.c b/net/pkt/pkt_conn.c
index 9a1fcf871a9..1949b97950a 100644
--- a/net/pkt/pkt_conn.c
+++ b/net/pkt/pkt_conn.c
@@ -100,7 +100,7 @@ FAR struct pkt_conn_s *pkt_alloc(void)
{
/* Enqueue the connection into the active list */
- dq_addlast(&conn->sconn.node, &g_active_pkt_connections);
+ dq_addlast(&conn->sconn.s_node, &g_active_pkt_connections);
}
NET_BUFPOOL_UNLOCK(g_pkt_connections);
@@ -126,7 +126,7 @@ void pkt_free(FAR struct pkt_conn_s *conn)
/* Remove the connection from the active list */
- dq_rem(&conn->sconn.node, &g_active_pkt_connections);
+ dq_rem(&conn->sconn.s_node, &g_active_pkt_connections);
nxrmutex_destroy(&conn->sconn.s_lock);
#ifdef CONFIG_NET_PKT_WRITE_BUFFERS
@@ -163,6 +163,7 @@ FAR struct pkt_conn_s *pkt_active(FAR struct net_driver_s
*dev)
if (dev->d_lltype == NET_LL_ETHERNET || dev->d_lltype == NET_LL_IEEE80211)
{
FAR struct eth_hdr_s *ethhdr = NETLLBUF;
+
ethertype = ethhdr->type;
}
@@ -178,7 +179,7 @@ FAR struct pkt_conn_s *pkt_active(FAR struct net_driver_s
*dev)
/* Look at the next active connection */
- conn = (FAR struct pkt_conn_s *)conn->sconn.node.flink;
+ conn = (FAR struct pkt_conn_s *)conn->sconn.s_node.flink;
}
return conn;
@@ -203,7 +204,7 @@ FAR struct pkt_conn_s *pkt_nextconn(FAR struct pkt_conn_s
*conn)
}
else
{
- return (FAR struct pkt_conn_s *)conn->sconn.node.flink;
+ return (FAR struct pkt_conn_s *)conn->sconn.s_node.flink;
}
}
diff --git a/net/sixlowpan/sixlowpan_send.c b/net/sixlowpan/sixlowpan_send.c
index 9b72939899d..b846b95f1b0 100644
--- a/net/sixlowpan/sixlowpan_send.c
+++ b/net/sixlowpan/sixlowpan_send.c
@@ -242,8 +242,8 @@ int sixlowpan_send(FAR struct net_driver_s *dev, FAR struct
udp_conn_s *conn,
* device related events, no connect-related events.
*/
- sinfo.s_cb = devif_callback_alloc(dev, &conn->sconn.list,
- &conn->sconn.list_tail);
+ sinfo.s_cb = devif_callback_alloc(dev, &conn->sconn.s_list,
+ &conn->sconn.s_listtail);
if (sinfo.s_cb != NULL)
{
int ret;
@@ -281,8 +281,8 @@ int sixlowpan_send(FAR struct net_driver_s *dev, FAR struct
udp_conn_s *conn,
/* Make sure that no further events are processed */
- devif_conn_callback_free(dev, sinfo.s_cb, &conn->sconn.list,
- &conn->sconn.list_tail);
+ devif_conn_callback_free(dev, sinfo.s_cb, &conn->sconn.s_list,
+ &conn->sconn.s_listtail);
}
}
diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h
index 5ab1ddf006a..391bc656ab4 100644
--- a/net/tcp/tcp.h
+++ b/net/tcp/tcp.h
@@ -58,9 +58,9 @@
*/
#define tcp_callback_alloc(conn) \
- devif_callback_alloc((conn)->dev, &(conn)->sconn.list,
&(conn)->sconn.list_tail)
+ devif_callback_alloc((conn)->dev, &(conn)->sconn.s_list,
&(conn)->sconn.s_listtail)
#define tcp_callback_free(conn,cb) \
- devif_conn_callback_free((conn)->dev, (cb), &(conn)->sconn.list,
&(conn)->sconn.list_tail)
+ devif_conn_callback_free((conn)->dev, (cb), &(conn)->sconn.s_list,
&(conn)->sconn.s_listtail)
#ifdef CONFIG_NET_TCP_WRITE_BUFFERS
/* TCP write buffer access macros */
diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c
index 08774700f44..7f1303809a3 100644
--- a/net/tcp/tcp_callback.c
+++ b/net/tcp/tcp_callback.c
@@ -298,7 +298,7 @@ uint32_t tcp_callback(FAR struct net_driver_s *dev,
* not set, then dev->d_len should also be cleared).
*/
- flags = devif_conn_event(dev, flags, conn->sconn.list);
+ flags = devif_conn_event(dev, flags, conn->sconn.s_list);
/* There may be no new data handler in place at them moment that the new
* incoming data is received. If the new incoming data was not handled,
diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c
index dc6f8089caf..3e97ce5662e 100644
--- a/net/tcp/tcp_conn.c
+++ b/net/tcp/tcp_conn.c
@@ -257,7 +257,7 @@ static inline FAR struct tcp_conn_s *
/* Look at the next active connection */
- conn = (FAR struct tcp_conn_s *)conn->sconn.node.flink;
+ conn = (FAR struct tcp_conn_s *)conn->sconn.s_node.flink;
}
return conn;
@@ -324,7 +324,7 @@ static inline FAR struct tcp_conn_s *
/* Look at the next active connection */
- conn = (FAR struct tcp_conn_s *)conn->sconn.node.flink;
+ conn = (FAR struct tcp_conn_s *)conn->sconn.s_node.flink;
}
return conn;
@@ -682,7 +682,7 @@ FAR struct tcp_conn_s *tcp_alloc(uint8_t domain)
/* Look at the next active connection */
- tmp = (FAR struct tcp_conn_s *)tmp->sconn.node.flink;
+ tmp = (FAR struct tcp_conn_s *)tmp->sconn.s_node.flink;
}
/* Did we find a connection that we can reuse? */
@@ -836,7 +836,7 @@ void tcp_free(FAR struct tcp_conn_s *conn)
* callback for CONFIG_NET_TCP_WRITE_BUFFERS is left.
*/
- for (cb = conn->sconn.list; cb; cb = next)
+ for (cb = conn->sconn.s_list; cb; cb = next)
{
next = cb->nxtconn;
tcp_callback_free(conn, cb);
@@ -853,7 +853,7 @@ void tcp_free(FAR struct tcp_conn_s *conn)
/* Remove the connection from the active list */
tcp_conn_list_lock();
- dq_rem(&conn->sconn.node, &g_active_tcp_connections);
+ dq_rem(&conn->sconn.s_node, &g_active_tcp_connections);
tcp_conn_list_unlock();
}
@@ -1036,7 +1036,7 @@ FAR struct tcp_conn_s *tcp_nextconn(FAR struct tcp_conn_s
*conn)
}
else
{
- return (FAR struct tcp_conn_s *)conn->sconn.node.flink;
+ return (FAR struct tcp_conn_s *)conn->sconn.s_node.flink;
}
}
@@ -1582,7 +1582,7 @@ void tcp_conn_list_unlock(void)
void tcp_add_active_conn(FAR struct tcp_conn_s *conn)
{
tcp_conn_list_lock();
- dq_addlast(&conn->sconn.node, &g_active_tcp_connections);
+ dq_addlast(&conn->sconn.s_node, &g_active_tcp_connections);
tcp_conn_list_unlock();
}
@@ -1599,7 +1599,7 @@ void tcp_add_active_conn(FAR struct tcp_conn_s *conn)
void tcp_removeconn(FAR struct tcp_conn_s *conn)
{
- dq_rem(&conn->sconn.node, &g_active_tcp_connections);
+ dq_rem(&conn->sconn.s_node, &g_active_tcp_connections);
}
/****************************************************************************
@@ -1624,7 +1624,7 @@ void tcp_remove_syn_backlog(FAR struct tcp_conn_s
*listener)
while (next)
{
conn = next;
- next = (FAR struct tcp_conn_s *)conn->sconn.node.flink;
+ next = (FAR struct tcp_conn_s *)conn->sconn.s_node.flink;
if (conn->tcpstateflags == TCP_SYN_RCVD &&
#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
tcp_conn_cmp(listener->domain,
diff --git a/net/udp/udp.h b/net/udp/udp.h
index b30ea03941d..d448c1e1500 100644
--- a/net/udp/udp.h
+++ b/net/udp/udp.h
@@ -64,9 +64,9 @@
/* Allocate a new UDP data callback */
#define udp_callback_alloc(dev,conn) \
- devif_callback_alloc((dev), &(conn)->sconn.list, &(conn)->sconn.list_tail)
+ devif_callback_alloc((dev), &(conn)->sconn.s_list, &(conn)->sconn.s_listtail)
#define udp_callback_free(dev,conn,cb) \
- devif_conn_callback_free((dev), (cb), &(conn)->sconn.list,
&(conn)->sconn.list_tail)
+ devif_conn_callback_free((dev), (cb), &(conn)->sconn.s_list,
&(conn)->sconn.s_listtail)
/* Definitions for the UDP connection struct flag field */
diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c
index 4f8a28f7227..3536a98b20b 100644
--- a/net/udp/udp_callback.c
+++ b/net/udp/udp_callback.c
@@ -294,7 +294,7 @@ uint32_t udp_callback(FAR struct net_driver_s *dev,
/* Perform the callback */
conn_lock(&conn->sconn);
- flags = devif_conn_event(dev, flags, conn->sconn.list);
+ flags = devif_conn_event(dev, flags, conn->sconn.s_list);
if ((flags & UDP_NEWDATA) != 0)
{
diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c
index 25718734e53..a730f559e45 100644
--- a/net/udp/udp_conn.c
+++ b/net/udp/udp_conn.c
@@ -712,7 +712,7 @@ FAR struct udp_conn_s *udp_alloc(uint8_t domain)
#endif
/* Enqueue the connection into the active list */
- dq_addlast(&conn->sconn.node, &g_active_udp_connections);
+ dq_addlast(&conn->sconn.s_node, &g_active_udp_connections);
}
NET_BUFPOOL_UNLOCK(g_udp_connections);
@@ -743,7 +743,7 @@ void udp_free(FAR struct udp_conn_s *conn)
/* Remove the connection from the active list */
- dq_rem(&conn->sconn.node, &g_active_udp_connections);
+ dq_rem(&conn->sconn.s_node, &g_active_udp_connections);
nxrmutex_destroy(&conn->sconn.s_lock);
/* Release any read-ahead buffers attached to the connection, NULL is ok */
@@ -864,7 +864,7 @@ FAR struct udp_conn_s *udp_nextconn(FAR struct udp_conn_s
*conn)
}
else
{
- return (FAR struct udp_conn_s *)conn->sconn.node.flink;
+ return (FAR struct udp_conn_s *)conn->sconn.s_node.flink;
}
}
diff --git a/net/usrsock/usrsock_conn.c b/net/usrsock/usrsock_conn.c
index b81e6e1faa3..e00eb290127 100644
--- a/net/usrsock/usrsock_conn.c
+++ b/net/usrsock/usrsock_conn.c
@@ -109,7 +109,7 @@ FAR struct usrsock_conn_s *usrsock_alloc(void)
/* Enqueue the connection into the active list */
- dq_addlast(&conn->sconn.node, &g_active_usrsock_connections);
+ dq_addlast(&conn->sconn.s_node, &g_active_usrsock_connections);
}
NET_BUFPOOL_UNLOCK(g_usrsock_connections);
@@ -135,7 +135,7 @@ void usrsock_free(FAR struct usrsock_conn_s *conn)
/* Remove the connection from the active list */
- dq_rem(&conn->sconn.node, &g_active_usrsock_connections);
+ dq_rem(&conn->sconn.s_node, &g_active_usrsock_connections);
/* Reset structure */
@@ -168,7 +168,7 @@ FAR struct usrsock_conn_s *usrsock_nextconn(FAR struct
usrsock_conn_s *conn)
}
else
{
- return (FAR struct usrsock_conn_s *)conn->sconn.node.flink;
+ return (FAR struct usrsock_conn_s *)conn->sconn.s_node.flink;
}
}
@@ -216,8 +216,8 @@ int usrsock_setup_request_callback(FAR struct
usrsock_conn_s *conn,
/* Set up the callback in the connection */
- pstate->cb = devif_callback_alloc(NULL, &conn->sconn.list,
- &conn->sconn.list_tail);
+ pstate->cb = devif_callback_alloc(NULL, &conn->sconn.s_list,
+ &conn->sconn.s_listtail);
if (pstate->cb)
{
/* Take a lock since only one outstanding request is allowed */
@@ -271,8 +271,8 @@ void usrsock_teardown_request_callback(FAR struct
usrsock_reqstate_s *pstate)
/* Make sure that no further events are processed */
- devif_conn_callback_free(NULL, pstate->cb, &conn->sconn.list,
- &conn->sconn.list_tail);
+ devif_conn_callback_free(NULL, pstate->cb, &conn->sconn.s_list,
+ &conn->sconn.s_listtail);
nxsem_destroy(&pstate->recvsem);
pstate->cb = NULL;
diff --git a/net/usrsock/usrsock_event.c b/net/usrsock/usrsock_event.c
index d0c380425a9..5e1da1340c5 100644
--- a/net/usrsock/usrsock_event.c
+++ b/net/usrsock/usrsock_event.c
@@ -117,7 +117,7 @@ int usrsock_event(FAR struct usrsock_conn_s *conn)
/* Send events to callbacks */
- devif_conn_event(NULL, events, conn->sconn.list);
+ devif_conn_event(NULL, events, conn->sconn.s_list);
usrsock_unlock();
return OK;
diff --git a/net/usrsock/usrsock_poll.c b/net/usrsock/usrsock_poll.c
index 189edc34080..0a863fb8767 100644
--- a/net/usrsock/usrsock_poll.c
+++ b/net/usrsock/usrsock_poll.c
@@ -165,7 +165,8 @@ static int usrsock_pollsetup(FAR struct socket *psock,
/* Allocate a usrsock callback structure */
- cb = devif_callback_alloc(NULL, &conn->sconn.list, &conn->sconn.list_tail);
+ cb = devif_callback_alloc(NULL, &conn->sconn.s_list,
+ &conn->sconn.s_listtail);
if (cb == NULL)
{
ret = -EBUSY;
@@ -303,8 +304,8 @@ static int usrsock_pollteardown(FAR struct socket *psock,
devif_conn_callback_free(NULL,
info->cb,
- &conn->sconn.list,
- &conn->sconn.list_tail);
+ &conn->sconn.s_list,
+ &conn->sconn.s_listtail);
/* Release the poll/select data slot */
