mirror of
https://github.com/apache/nuttx.git
synced 2026-05-31 14:27:37 +08:00
NET: Fix a few problems after big merge of network reorganization
This commit is contained in:
@@ -250,7 +250,7 @@
|
|||||||
# define CONFIG_NET_ARPTAB_SIZE 8
|
# define CONFIG_NET_ARPTAB_SIZE 8
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CONFIG_NET_ARPTAB_SIZE
|
#ifndef CONFIG_NET_ARP_MAXAGE
|
||||||
/* The maximum age of ARP table entries measured in 10ths of seconds.
|
/* The maximum age of ARP table entries measured in 10ths of seconds.
|
||||||
*
|
*
|
||||||
* An CONFIG_NET_ARP_MAXAGE of 120 corresponds to 20 minutes (BSD
|
* An CONFIG_NET_ARP_MAXAGE of 120 corresponds to 20 minutes (BSD
|
||||||
|
|||||||
+1
-1
@@ -51,8 +51,8 @@
|
|||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <net/ethernet.h>
|
#include <net/ethernet.h>
|
||||||
|
|
||||||
#include <nuttx/net/netconfig.h>
|
#include <nuttx/net/netconfig.h>
|
||||||
#include <nuttx/net/netdev.h>
|
#include <nuttx/net/netdev.h>
|
||||||
#include <nuttx/net/arp.h>
|
#include <nuttx/net/arp.h>
|
||||||
|
|||||||
+2
-1
@@ -49,6 +49,7 @@
|
|||||||
# include <netpacket/packet.h>
|
# include <netpacket/packet.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <nuttx/net/net.h>
|
||||||
#include <nuttx/net/udp.h>
|
#include <nuttx/net/udp.h>
|
||||||
|
|
||||||
#include "socket/socket.h"
|
#include "socket/socket.h"
|
||||||
@@ -140,7 +141,7 @@ static int pkt_bind(FAR struct pkt_conn_s *conn,
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
int psock_bind(FAR struct socket *psock, const struct sockaddr *addr,
|
int psock_bind(FAR struct socket *psock, const struct sockaddr *addr,
|
||||||
socklen_t addrlen)
|
socklen_t addrlen)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_NET_PKT
|
#ifdef CONFIG_NET_PKT
|
||||||
FAR const struct sockaddr_ll *lladdr = (const struct sockaddr_ll *)addr;
|
FAR const struct sockaddr_ll *lladdr = (const struct sockaddr_ll *)addr;
|
||||||
|
|||||||
+1
-1
@@ -880,7 +880,7 @@ FAR struct tcp_conn_s *tcp_backlogremove(FAR struct tcp_conn_s *conn);
|
|||||||
|
|
||||||
#ifdef CONFIG_NET_TCPBACKLOG
|
#ifdef CONFIG_NET_TCPBACKLOG
|
||||||
int tcp_backlogdelete(FAR struct tcp_conn_s *conn,
|
int tcp_backlogdelete(FAR struct tcp_conn_s *conn,
|
||||||
FAR struct tcp_conn_s *blconn)
|
FAR struct tcp_conn_s *blconn);
|
||||||
#else
|
#else
|
||||||
# define tcp_backlogdelete(c,b) (-ENOSYS)
|
# define tcp_backlogdelete(c,b) (-ENOSYS)
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -50,6 +50,7 @@
|
|||||||
#include <nuttx/net/net.h>
|
#include <nuttx/net/net.h>
|
||||||
|
|
||||||
#include "devif/devif.h"
|
#include "devif/devif.h"
|
||||||
|
#include "tcp/tcp.h"
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Private Data
|
* Private Data
|
||||||
|
|||||||
@@ -44,6 +44,8 @@
|
|||||||
|
|
||||||
#include <nuttx/net/iob.h>
|
#include <nuttx/net/iob.h>
|
||||||
|
|
||||||
|
#include "tcp/tcp.h"
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG
|
#ifdef CONFIG_DEBUG
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
|
|||||||
Reference in New Issue
Block a user