Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 01:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Networking: The network device list was protected by a re-entrant semaphore. With the recent change to support network device callback, the network stack needs to access the network device list too. Some drivers, however, run the network stack from the interrupt level -- this is bad but a fact in the current state. Of course,those drivers are unable to take the semaphore and will assert.

Browse Source 
The solution here is to eliminate the device devices semaphore altogether.  This eliminates netdev_semtake() and netdev_semgive() and replaces them with net_lock() and net_unlock() which have larger scope as needed for this purpose.
This commit is contained in:
Gregory Nutt
2015-05-31 08:34:03 -06:00
parent 6687e156e6
commit 33085cb309
16 changed files with 74 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/netdev/netdev_findbyaddr.c
+10 -7
View File
@@ -50,9 +50,10 @@
#include <nuttx/net/netdev.h>
#include <nuttx/net/ip.h>
#include "netdev/netdev.h"
#include "utils/utils.h"
#include "devif/devif.h"
#include "route/route.h"
#include "netdev/netdev.h"
/****************************************************************************
* Pre-processor Definitions
@@ -97,10 +98,11 @@
static FAR struct net_driver_s *netdev_finddevice_ipv4addr(in_addr_t ripaddr)
{
FAR struct net_driver_s *dev;
net_lock_t save;
/* Examine each registered network device */
netdev_semtake();
save = net_lock();
for (dev = g_netdevices; dev; dev = dev->flink)
{
/* Is the interface in the "up" state? */
@@ -114,7 +116,7 @@ static FAR struct net_driver_s *netdev_finddevice_ipv4addr(in_addr_t ripaddr)
{
/* Its a match */
netdev_semgive();
net_unlock(save);
return dev;
}
}
@@ -122,7 +124,7 @@ static FAR struct net_driver_s *netdev_finddevice_ipv4addr(in_addr_t ripaddr)
/* No device with the matching address found */
netdev_semgive();
net_unlock(save);
return NULL;
}
#endif /* CONFIG_NET_IPv4 */
@@ -151,10 +153,11 @@ static FAR struct net_driver_s *
netdev_finddevice_ipv6addr(const net_ipv6addr_t ripaddr)
{
FAR struct net_driver_s *dev;
net_lock_t save;
/* Examine each registered network device */
netdev_semtake();
save = net_lock();
for (dev = g_netdevices; dev; dev = dev->flink)
{
/* Is the interface in the "up" state? */
@@ -168,7 +171,7 @@ netdev_finddevice_ipv6addr(const net_ipv6addr_t ripaddr)
{
/* Its a match */
netdev_semgive();
net_unlock(save);
return dev;
}
}
@@ -176,7 +179,7 @@ netdev_finddevice_ipv6addr(const net_ipv6addr_t ripaddr)
/* No device with the matching address found */
netdev_semgive();
net_unlock(save);
return NULL;
}
#endif /* CONFIG_NET_IPv6 */