Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 14:27:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

net/procfs and netdev: Fix some problems with ifconfig introduced with last changes. Also picks up one of Sebastien's changes that did not make it it before. net/udp: Fixes a DEBUGASSERT.

Browse Source
This commit is contained in:
Gregory Nutt
2018-06-25 16:55:45 -06:00
parent 65be13bffe
commit c439b93627
4 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/netdev/netdev.h
+3 -2
View File
@@ -225,7 +225,8 @@ FAR struct net_driver_s *netdev_findby_ipv6addr(const net_ipv6addr_t lipaddr,
* Find a previously registered network device by assigned interface index.
*
* Input Parameters:
* ifindex - The interface index
* ifindex - The interface index. This is a one-based index and must be
* greater than zero.
*
* Returned Value:
* Pointer to driver on success; NULL on failure. This function will return
@@ -243,7 +244,7 @@ FAR struct net_driver_s *netdev_findbyindex(int ifindex);
*
* Input Parameters:
* ifindex - The first interface index to check. Usually in a traversal
* this would be the previous inteface index plus 1.
* this would be the previous interface index plus 1.
*
* Returned Value:
* The interface index for the next network driver. -ENODEV is returned if
net/netdev/netdev_findbyindex.c
+7 -6
View File
@@ -61,7 +61,8 @@
* Find a previously registered network device by assigned interface index.
*
* Input Parameters:
* ifindex - The interface index
* ifindex - The interface index. This is a one-based index and must be
* greater than zero.
*
* Returned Value:
* Pointer to driver on success; NULL on failure. This function will return
@@ -80,8 +81,7 @@ FAR struct net_driver_s *netdev_findbyindex(int ifindex)
*/
DEBUGASSERT(ifindex > 0 && ifindex <= MAX_IFINDEX);
ifindex--;
if (ifindex < 0 || ifindex >= MAX_IFINDEX)
if (ifindex < 1 || ifindex > MAX_IFINDEX)
{
return NULL;
}
@@ -92,7 +92,7 @@ FAR struct net_driver_s *netdev_findbyindex(int ifindex)
#ifdef CONFIG_NETDEV_IFINDEX
/* Check if this index has been assigned */
if ((g_devset & (1L << ifindex)) == 0)
if ((g_devset & (1L << (ifindex-1))) == 0)
{
/* This index has not been assigned */
@@ -115,7 +115,8 @@ FAR struct net_driver_s *netdev_findbyindex(int ifindex)
* causing a given index to be meaningless (unless, of course, the
* caller keeps the network locked).
*/
if (i == ifindex)
if (i == (ifindex - 1))
#endif
{
net_unlock();
@@ -135,7 +136,7 @@ FAR struct net_driver_s *netdev_findbyindex(int ifindex)
*
* Input Parameters:
* ifindex - The first interface index to check. Usually in a traversal
* this would be the previous inteface index plus 1.
* this would be the previous interface index plus 1.
*
* Returned Value:
* The interface index for the next network driver. -ENODEV is returned if