Move include/nuttx/net/uip/uip-arch.h to include/nuttx/net/arp.h; rename all uip_arp_ functions to arp_
This commit is contained in:
parent
5ff8c449e2
commit
86a4890fca
@ -49,7 +49,7 @@
|
|||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <nuttx/net/uip/uip.h>
|
#include <nuttx/net/uip/uip.h>
|
||||||
#include <nuttx/net/uip/uip-arp.h>
|
#include <nuttx/net/arp.h>
|
||||||
|
|
||||||
#include <apps/netutils/uiplib.h>
|
#include <apps/netutils/uiplib.h>
|
||||||
#include <apps/netutils/discover.h>
|
#include <apps/netutils/discover.h>
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <nuttx/net/uip/uip.h>
|
#include <nuttx/net/uip/uip.h>
|
||||||
#include <nuttx/net/uip/uip-arp.h>
|
#include <nuttx/net/arp.h>
|
||||||
|
|
||||||
#include <apps/netutils/uiplib.h>
|
#include <apps/netutils/uiplib.h>
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <netinet/ether.h>
|
#include <netinet/ether.h>
|
||||||
|
|
||||||
#include <nuttx/net/uip/uip-arp.h>
|
#include <nuttx/net/arp.h>
|
||||||
#include <apps/netutils/uiplib.h>
|
#include <apps/netutils/uiplib.h>
|
||||||
#include <apps/netutils/thttpd.h>
|
#include <apps/netutils/thttpd.h>
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <nuttx/net/uip/uip.h>
|
#include <nuttx/net/uip/uip.h>
|
||||||
#include <nuttx/net/uip/uip-arp.h>
|
#include <nuttx/net/arp.h>
|
||||||
|
|
||||||
#include <apps/netutils/uiplib.h>
|
#include <apps/netutils/uiplib.h>
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@
|
|||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <nuttx/net/uip/uip.h>
|
#include <nuttx/net/uip/uip.h>
|
||||||
#include <nuttx/net/uip/uip-arp.h>
|
#include <nuttx/net/arp.h>
|
||||||
|
|
||||||
#include <apps/netutils/uiplib.h>
|
#include <apps/netutils/uiplib.h>
|
||||||
#include <apps/netutils/xmlrpc.h>
|
#include <apps/netutils/xmlrpc.h>
|
||||||
|
@ -56,7 +56,7 @@
|
|||||||
# include <debug.h> /* For ndbg, vdbg */
|
# include <debug.h> /* For ndbg, vdbg */
|
||||||
# include <nuttx/compiler.h> /* For CONFIG_CPP_HAVE_WARNING */
|
# include <nuttx/compiler.h> /* For CONFIG_CPP_HAVE_WARNING */
|
||||||
# include <arch/irq.h> /* For irqstore() and friends -- REVISIT */
|
# include <arch/irq.h> /* For irqstore() and friends -- REVISIT */
|
||||||
# include <nuttx/net/uip/uip-arp.h> /* For low-level ARP interfaces -- REVISIT */
|
# include <nuttx/net/arp.h> /* For low-level ARP interfaces -- REVISIT */
|
||||||
# include <apps/netutils/dhcpd.h> /* Advertised DHCPD APIs */
|
# include <apps/netutils/dhcpd.h> /* Advertised DHCPD APIs */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -277,7 +277,7 @@ static inline void dhcpd_arpupdate(uint16_t *pipaddr, uint8_t *phwaddr)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
flags = uip_lock();
|
flags = uip_lock();
|
||||||
uip_arp_update(pipaddr, phwaddr);
|
arp_update(pipaddr, phwaddr);
|
||||||
uip_unlock(flags);
|
uip_unlock(flags);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user