Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-09-27 18:58:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

IP forward: Correct some compile issues due to recent changes.

Browse Source
This commit is contained in:
Gregory Nutt
2017-08-20 11:46:43 -06:00
parent b226dd9117
commit 1334ab3d2a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/tun.c
+8 -6
View File
@@ -38,7 +38,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_TUN)
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
@@ -55,19 +54,22 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <net/if.h>
#ifdef CONFIG_NET_PKT
# include <nuttx/net/pkt.h>
#endif
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/wdog.h> #include <nuttx/wdog.h>
#include <nuttx/wqueue.h> #include <nuttx/wqueue.h>
#include <nuttx/net/arp.h> #include <nuttx/net/arp.h>
#include <nuttx/net/netdev.h> #include <nuttx/net/netdev.h>
#include <nuttx/net/ethernet.h>
#include <nuttx/net/tun.h> #include <nuttx/net/tun.h>
#include <net/if.h> #if defined(CONFIG_NET) && defined(CONFIG_NET_TUN)
#ifdef CONFIG_NET_PKT
# include <nuttx/net/pkt.h>
#endif
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
net/ipforward/ipv6_forward.c
-2
View File
@@ -151,7 +151,6 @@ static int ipv6_hdrsize(FAR struct ipv6_hdr_s *ipv6)
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NET_6LOWPAN
static int ipv6_decr_ttl(FAR struct ipv6_hdr_s *ipv6) static int ipv6_decr_ttl(FAR struct ipv6_hdr_s *ipv6)
{ {
int ttl = (int)ipv6->ttl - 1; int ttl = (int)ipv6->ttl - 1;
@@ -179,7 +178,6 @@ static int ipv6_decr_ttl(FAR struct ipv6_hdr_s *ipv6)
return ttl; return ttl;
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: ipv6_packet_conversion * Name: ipv6_packet_conversion