michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: tcp: Be more consistent with namespaces for private funcs

Browse source 
Change-Id: Ie2699e01c5cc19cd04eed8383d6c73769366a55e
Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Leandro Pereira 2016-12-19 15:00:22 -08:00 • committed by Tomasz Bursztyka
commit 84b68b8b21
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/net/ip/net_context.c
View file

@ -1484,7 +1484,7 @@ static int send_data(struct net_context *context,
#if defined(CONFIG_NET_TCP) #if defined(CONFIG_NET_TCP)
if (net_context_get_ip_proto(context) == IPPROTO_TCP) { if (net_context_get_ip_proto(context) == IPPROTO_TCP) {
int ret = tcp_send_data(context); int ret = net_tcp_send_data(context);
/* Just make the callback synchronously even if it didn't /* Just make the callback synchronously even if it didn't
* go over the wire. In theory it would be nice to track * go over the wire. In theory it would be nice to track
@ -1692,7 +1692,7 @@ static int sendto(struct net_buf *buf,
#if defined(CONFIG_NET_TCP) #if defined(CONFIG_NET_TCP)
if (net_context_get_ip_proto(context) == IPPROTO_TCP) { if (net_context_get_ip_proto(context) == IPPROTO_TCP) {
ret = tcp_queue_data(context, buf); ret = net_tcp_queue_data(context, buf);
} else } else
#endif /* CONFIG_NET_TCP */ #endif /* CONFIG_NET_TCP */
{ {

7
subsys/net/ip/tcp.c
View file

@ -592,7 +592,7 @@ const char * const net_tcp_state_str(enum net_tcp_state state)
return ""; return "";
} }
int tcp_queue_data(struct net_context *context, struct net_buf *buf) int net_tcp_queue_data(struct net_context *context, struct net_buf *buf)
{ {
int ret, data_len; int ret, data_len;
struct net_conn *conn = (struct net_conn *)context->conn_handler; struct net_conn *conn = (struct net_conn *)context->conn_handler;
@ -652,7 +652,7 @@ static void restart_timer(struct net_tcp *tcp)
} }
} }
int tcp_send_data(struct net_context *context) int net_tcp_send_data(struct net_context *context)
{ {
struct net_buf *buf; struct net_buf *buf;
sys_snode_t *node; sys_snode_t *node;
@ -719,7 +719,8 @@ void net_tcp_ack_received(struct net_context *ctx, uint32_t ack)
sent_list); sent_list);
net_nbuf_set_buf_sent(buf, false); net_nbuf_set_buf_sent(buf, false);
} }
tcp_send_data(ctx);
net_tcp_send_data(ctx);
} }
} }
} }

4
subsys/net/ip/tcp.h
View file

@ -286,7 +286,7 @@ void net_tcp_foreach(net_tcp_cb_t cb, void *user_data);
* *
* @return 0 if ok, < 0 if error * @return 0 if ok, < 0 if error
*/ */
int tcp_send_data(struct net_context *context); int net_tcp_send_data(struct net_context *context);
/** /**
* @brief Enqueue a single packet for transmission * @brief Enqueue a single packet for transmission
@ -296,7 +296,7 @@ int tcp_send_data(struct net_context *context);
* *
* @return 0 if ok, < 0 if error * @return 0 if ok, < 0 if error
*/ */
int tcp_queue_data(struct net_context *context, struct net_buf *buf); int net_tcp_queue_data(struct net_context *context, struct net_buf *buf);
/** /**
* @brief Sends one TCP packet initialized with the _prepare_*() * @brief Sends one TCP packet initialized with the _prepare_*()