Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-09-06 00:52:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

14
drivers/net/tun.c
View file

@ -38,7 +38,6 @@
****************************************************************************/
#include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_TUN)
#include <stdint.h>
#include <stdbool.h>
@ -55,19 +54,22 @@
#include <arpa/inet.h>
#include <net/if.h>
#ifdef CONFIG_NET_PKT
# include <nuttx/net/pkt.h>
#endif
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/wdog.h>
#include <nuttx/wqueue.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/ethernet.h>
#include <nuttx/net/tun.h>
#include <net/if.h>
#ifdef CONFIG_NET_PKT
# include <nuttx/net/pkt.h>
#endif
#if defined(CONFIG_NET) && defined(CONFIG_NET_TUN)
/****************************************************************************
* Pre-processor Definitions

2
net/ipforward/ipv6_forward.c
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)
{
int ttl = (int)ipv6->ttl - 1;
@ -179,7 +178,6 @@ static int ipv6_decr_ttl(FAR struct ipv6_hdr_s *ipv6)
return ttl;
}
#endif
/****************************************************************************
* Name: ipv6_packet_conversion