Merge branch 'master' into ppp-new

This commit is contained in:
Sylvain Rochet
2014-02-24 20:21:47 +01:00
4 changed files with 44 additions and 14 deletions

View File

@@ -497,6 +497,14 @@
#define ARP_QUEUEING 0
#endif
/** The maximum number of packets which may be queued for each
* unresolved address by other network layers. Defaults to 3, 0 means disabled.
* Old packets are dropped, new packets are queued.
*/
#ifndef ARP_QUEUE_LEN
#define ARP_QUEUE_LEN 3
#endif
/**
* ETHARP_TRUST_IP_MAC==1: Incoming IP packets cause the ARP table to be
* updated with the source MAC and IP addresses supplied in the packet.

View File

@@ -137,8 +137,8 @@ PACK_STRUCT_END
#define SIZEOF_ETHARP_PACKET_TX SIZEOF_ETHARP_PACKET
#endif /* ETHARP_SUPPORT_VLAN && defined(LWIP_HOOK_VLAN_SET) */
/** 5 seconds period */
#define ARP_TMR_INTERVAL 5000
/** 1 seconds period */
#define ARP_TMR_INTERVAL 1000
#define ETHTYPE_ARP 0x0806U
#define ETHTYPE_IP 0x0800U