diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-07-13 03:43:06 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-07-13 03:43:06 +0000 |
| commit | 7569e53f92cc6c313c8642a8cc53dfacea63382b (patch) | |
| tree | 50917f724a6a70b33050502c1b4bc395528fd460 /nuttx/net/uip/uip_arp.c | |
| parent | 35a4b3030e7548e6aace209ef8e92a5e2b495d1e (diff) | |
| download | px4-nuttx-7569e53f92cc6c313c8642a8cc53dfacea63382b.tar.gz px4-nuttx-7569e53f92cc6c313c8642a8cc53dfacea63382b.tar.bz2 px4-nuttx-7569e53f92cc6c313c8642a8cc53dfacea63382b.zip | |
IGMP debug fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2791 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net/uip/uip_arp.c')
| -rw-r--r-- | nuttx/net/uip/uip_arp.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/nuttx/net/uip/uip_arp.c b/nuttx/net/uip/uip_arp.c index 6e00a6b63..270bddd64 100644 --- a/nuttx/net/uip/uip_arp.c +++ b/nuttx/net/uip/uip_arp.c @@ -64,9 +64,6 @@ #include <net/ethernet.h> #include <net/uip/uip-arch.h> #include <net/uip/uip-arp.h> -#ifdef CONFIG_NET_IGMP -# include <net/uip/uip-igmp.h> -#endif /**************************************************************************** * Pre-processor Definitions @@ -83,11 +80,6 @@ #define ARPBUF ((struct arp_hdr *)&dev->d_buf[UIP_LLH_LEN]) #define IPBUF ((struct ethip_hdr *)&dev->d_buf[UIP_LLH_LEN]) -#ifdef CONFIG_NET_IGMP -# define RA ((uint16_t *)&dev->d_buf[UIP_LLH_LEN]) -# define RAIPBUF ((struct ethip_hdr *)&dev->d_buf[UIP_LLH_LEN+RASIZE]) -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -298,28 +290,10 @@ void uip_arp_out(struct uip_driver_s *dev) const struct arp_entry *tabptr = NULL; struct arp_hdr *parp = ARPBUF; struct uip_eth_hdr *peth = ETHBUF; - struct ethip_hdr *pip; + struct ethip_hdr *pip = IPBUF; in_addr_t ipaddr; in_addr_t destipaddr; - /* Check for the router alert option */ - -#if CONFIG_NET_IGMP - if (RA[0] == HTONS(ROUTER_ALERT >> 16) && RA[1] == HTONS(ROUTER_ALERT & 0xffff)) - { - /* Yes... there is a router alert. This must be an IGMP packet. - * bump up the IP header address to index around the router alert. - */ - - pip = RAIPBUF; - } - else -#else - { - pip = IPBUF; - } -#endif - /* Find the destination IP address in the ARP table and construct * the Ethernet header. If the destination IP addres isn't on the * local network, we use the default router's IP address instead. |