OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "net: downgrade iob priority of input/udp/icmp to avoid blocking devif" 

This reverts commit d87620abc9.
This commit is contained in:
Zhe Weng 2023-01-11 17:00:55 +08:00 committed by Xiang Xiao
parent 4de3387eb2
commit 6222ad5764
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/icmp/icmp_reply.c
View File

@ -146,7 +146,7 @@ void icmp_reply(FAR struct net_driver_s *dev, int type, int code)
/* Re-prepare device buffer */
if (netdev_iob_prepare(dev, true, 0) != OK)
if (netdev_iob_prepare(dev, false, 0) != OK)
{
dev->d_len = 0;
dev->d_iob = iob;
@ -157,7 +157,7 @@ void icmp_reply(FAR struct net_driver_s *dev, int type, int code)
/* Copy ipv4 header to device buffer */
if (iob_trycopyin(dev->d_iob, (FAR void *)ipv4,
IPv4_HDRLEN, 0, true) != IPv4_HDRLEN)
IPv4_HDRLEN, 0, false) != IPv4_HDRLEN)
{
dev->d_len = 0;
netdev_iob_release(dev);

2
net/icmp/icmp_sendmsg.c
View File

@ -118,7 +118,7 @@ static void sendto_request(FAR struct net_driver_s *dev,
iob_update_pktlen(dev->d_iob, IPv4_HDRLEN);
iob_copyin(dev->d_iob, pstate->snd_buf,
pstate->snd_buflen, IPv4_HDRLEN, true);
pstate->snd_buflen, IPv4_HDRLEN, false);
/* Initialize the IP header. */

4
net/icmpv6/icmpv6_reply.c
View File

@ -135,7 +135,7 @@ void icmpv6_reply(FAR struct net_driver_s *dev, int type, int code, int data)
/* Re-prepare device buffer */
if (netdev_iob_prepare(dev, true, 0) != OK)
if (netdev_iob_prepare(dev, false, 0) != OK)
{
dev->d_len = 0;
dev->d_iob = iob;
@ -146,7 +146,7 @@ void icmpv6_reply(FAR struct net_driver_s *dev, int type, int code, int data)
/* Copy ipv4 header to device buffer */
if (iob_trycopyin(dev->d_iob, (FAR void *)ipv6,
IPv6_HDRLEN, 0, true) != IPv6_HDRLEN)
IPv6_HDRLEN, 0, false) != IPv6_HDRLEN)
{
dev->d_len = 0;
netdev_iob_release(dev);

2
net/icmpv6/icmpv6_sendmsg.c
View File

@ -120,7 +120,7 @@ static void sendto_request(FAR struct net_driver_s *dev,
iob_update_pktlen(dev->d_iob, IPv6_HDRLEN);
iob_copyin(dev->d_iob, pstate->snd_buf,
pstate->snd_buflen, IPv6_HDRLEN, true);
pstate->snd_buflen, IPv6_HDRLEN, false);
/* Calculate the ICMPv6 checksum over the ICMPv6 header and payload. */

2
net/netdev/netdev_input.c
View File

@ -74,7 +74,7 @@ int netdev_input(FAR struct net_driver_s *dev,
/* Prepare iob buffer */
ret = netdev_iob_prepare(dev, true, 0);
ret = netdev_iob_prepare(dev, false, 0);
if (ret != OK)
{
return ret;

6
net/netdev/netdev_iob.c
View File

@ -60,10 +60,10 @@ int netdev_iob_prepare(FAR struct net_driver_s *dev, bool throttled,
if (dev->d_iob == NULL)
{
dev->d_iob = net_iobtimedalloc(true, timeout);
if (dev->d_iob == NULL && throttled == false)
dev->d_iob = net_iobtimedalloc(false, timeout);
if (dev->d_iob == NULL && throttled)
{
dev->d_iob = net_iobtimedalloc(false, timeout);
dev->d_iob = net_iobtimedalloc(true, timeout);
}
}

6
net/udp/udp_sendto_buffered.c
View File

@ -795,7 +795,7 @@ ssize_t psock_udp_sendto(FAR struct socket *psock, FAR const void *buf,
if (nonblock)
{
ret = iob_trycopyin(wrb->wb_iob, (FAR uint8_t *)buf,
len, udpiplen, true);
len, udpiplen, false);
}
else
{
@ -809,7 +809,7 @@ ssize_t psock_udp_sendto(FAR struct socket *psock, FAR const void *buf,
blresult = net_breaklock(&count);
ret = iob_copyin(wrb->wb_iob, (FAR uint8_t *)buf,
len, udpiplen, true);
len, udpiplen, false);
if (blresult >= 0)
{
net_restorelock(count);
@ -916,7 +916,7 @@ int psock_udp_cansend(FAR struct udp_conn_s *conn)
* many more.
*/
if (udp_wrbuffer_test() < 0 || iob_navail(true) <= 0)
if (udp_wrbuffer_test() < 0 || iob_navail(false) <= 0)
{
return -EWOULDBLOCK;
}

2
net/udp/udp_wrbuffer.c
View File

@ -263,7 +263,7 @@ FAR struct udp_wrbuffer_s *udp_wrbuffer_tryalloc(void)
/* Now get the first I/O buffer for the write buffer structure */
wrb->wb_iob = iob_tryalloc(true);
wrb->wb_iob = iob_tryalloc(false);
if (!wrb->wb_iob)
{
nerr("ERROR: Failed to allocate I/O buffer\n");