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

Remove CONFIG_NET_MULTILINK. This increases code size by a little, but greatly reduces the complexity of the network code.

Browse Source
This commit is contained in:
Gregory Nutt
2017-08-08 15:26:09 -06:00
parent bd7c84b23e
commit aeb59383cf
33 changed files with 171 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/tun.c
-6
View File
@@ -1189,12 +1189,8 @@ static int tun_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
int intf;
FAR struct ifreq *ifr = (FAR struct ifreq *)arg;
#ifdef CONFIG_NET_MULTILINK
if (!ifr || ((ifr->ifr_flags & IFF_MASK) != IFF_TUN &&
(ifr->ifr_flags & IFF_MASK) != IFF_TAP))
#else
if (!ifr || (ifr->ifr_flags & IFF_MASK) != IFF_TUN)
#endif
{
return -EINVAL;
}
@@ -1226,7 +1222,6 @@ static int tun_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
priv = filep->f_priv;
strncpy(ifr->ifr_name, priv->dev.d_ifname, IFNAMSIZ);
#ifdef CONFIG_NET_MULTILINK
if ((ifr->ifr_flags & IFF_MASK) == IFF_TAP)
{
/* TAP device -> handling raw Ethernet packets
@@ -1243,7 +1238,6 @@ static int tun_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
priv->dev.d_llhdrlen = 0;
}
#endif
tundev_unlock(tun);
drivers/wireless/spirit/include/spirit_linearfifo.h
+1 -1
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* include/nuttx/wireless/spirit/include/spirit_Linearfifo.h
* include/nuttx/wireless/spirit/include/spirit_linearfifo.h
* Configuration and management of SPIRIT Fifo.
*
* Copyright(c) 2015 STMicroelectronics
drivers/wireless/spirit/lib/spirit_linearfifo.c
+2 -2
View File
@@ -1,5 +1,5 @@
/******************************************************************************
* drivers/wireless/spirit/lib/spirit_Linearfifo.c
* drivers/wireless/spirit/lib/spirit_linearfifo.c
* Configuration and management of SPIRIT Fifo.
*
* Copyright(c) 2015 STMicroelectronics
@@ -40,7 +40,7 @@
#include <assert.h>
#include "spirit_Linearfifo.h"
#include "spirit_linearfifo.h"
#include "spirit_spi.h"
/******************************************************************************