michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: Use net_buf APIs for getting net_buf elements from FIFO

Browse source 
The net_buf API ensures that the frags pointer gets initialized
properly. Using nano_fifo_get could mean that buf->frags is something
else than NULL if there was more than one item in the FIFO.

Change-Id: If65e85a7cbe82f562307dc781d48110c3be0472b
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-06-13 17:50:11 +03:00
commit 4e3e23eb18
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
net/ip/net_core.c
View file

@ -673,16 +673,14 @@ struct net_buf *net_receive(struct net_context *context, int32_t timeout)
switch (timeout) { switch (timeout) {
case TICKS_UNLIMITED: case TICKS_UNLIMITED:
buf = nano_fifo_get(rx_queue, TICKS_UNLIMITED);
break;
case TICKS_NONE: case TICKS_NONE:
buf = nano_fifo_get(rx_queue, TICKS_NONE); buf = net_buf_get_timeout(rx_queue, 0, timeout);
break; break;
default: default:
#ifdef CONFIG_NANO_TIMEOUTS #ifdef CONFIG_NANO_TIMEOUTS
buf = buf_wait_timeout(rx_queue, timeout); buf = buf_wait_timeout(rx_queue, timeout);
#else /* CONFIG_NANO_TIMEOUTS */ #else /* CONFIG_NANO_TIMEOUTS */
buf = nano_fifo_get(rx_queue, TICKS_NONE); buf = net_buf_get_timeout(rx_queue, 0, TICKS_NONE);
#endif #endif
break; break;
} }
@ -841,7 +839,7 @@ static void net_tx_fiber(void)
int ret; int ret;
/* Get next packet from application - wait if necessary */ /* Get next packet from application - wait if necessary */
buf = nano_fifo_get(&netdev.tx_queue, TICKS_UNLIMITED); buf = net_buf_get_timeout(&netdev.tx_queue, 0, TICKS_UNLIMITED);
NET_DBG("Sending (buf %p, len %u) to IP stack\n", NET_DBG("Sending (buf %p, len %u) to IP stack\n",
buf, buf->len); buf, buf->len);
@ -885,7 +883,7 @@ static void net_rx_fiber(void)
sizeof(rx_fiber_stack)); sizeof(rx_fiber_stack));
while (1) { while (1) {
buf = nano_fifo_get(&netdev.rx_queue, TICKS_UNLIMITED); buf = net_buf_get_timeout(&netdev.rx_queue, 0, TICKS_UNLIMITED);
/* Check stack usage (no-op if not enabled) */ /* Check stack usage (no-op if not enabled) */
net_analyze_stack("RX fiber", rx_fiber_stack, net_analyze_stack("RX fiber", rx_fiber_stack,

2
net/ip/net_driver_15_4.c
View file

@ -106,7 +106,7 @@ static void net_rx_15_4_fiber(void)
while (1) { while (1) {
/* Wait next packet from 15.4 stack */ /* Wait next packet from 15.4 stack */
buf = nano_fifo_get(&rx_queue, TICKS_UNLIMITED); buf = net_buf_get_timeout(&rx_queue, 0, TICKS_UNLIMITED);
#if NET_MAC_CONF_STATS #if NET_MAC_CONF_STATS
byte_count = uip_pkt_buflen(buf); byte_count = uip_pkt_buflen(buf);