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

@@ -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