diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-10 15:23:11 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-10 15:23:11 -0600 |
| commit | 3116daedcaa8422e75e3aec6741eccf1db5107af (patch) | |
| tree | 0fe07f1ac54625dc5446dce2dac43ac93dbc2570 | |
| parent | 7351534e4099743c6504a6d1ed2048b6b614240d (diff) | |
| download | nuttx-3116daedcaa8422e75e3aec6741eccf1db5107af.tar.gz nuttx-3116daedcaa8422e75e3aec6741eccf1db5107af.tar.bz2 nuttx-3116daedcaa8422e75e3aec6741eccf1db5107af.zip | |
LP17 Ethernet Driver: Fix some compile problems when IPv6 is enabled
| -rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index c13dc2473..cce0d0463 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -362,7 +362,7 @@ static void lpc17_txtimeout(int argc, uint32_t arg, ...); /* NuttX callback functions */ #ifdef CONFIG_NET_ICMPv6 -static void lpc17_ipv6multicast(FAR struct lpc17_ethmac_s *priv); +static void lpc17_ipv6multicast(FAR struct lpc17_driver_s *priv); #endif static int lpc17_ifup(struct net_driver_s *dev); static int lpc17_ifdown(struct net_driver_s *dev); @@ -1445,7 +1445,7 @@ static void lpc17_polltimer(int argc, uint32_t arg, ...) ****************************************************************************/ #ifdef CONFIG_NET_ICMPv6 -static void lpc17_ipv6multicast(FAR struct lpc17_ethmac_s *priv) +static void lpc17_ipv6multicast(FAR struct lpc17_driver_s *priv) { struct net_driver_s *dev; uint16_t tmp16; @@ -1466,7 +1466,7 @@ static void lpc17_ipv6multicast(FAR struct lpc17_ethmac_s *priv) mac[0] = 0x33; mac[1] = 0x33; - dev = &priv->dev; + dev = &priv->lp_dev; tmp16 = dev->d_ipv6addr[6]; mac[2] = 0xff; mac[3] = tmp16 >> 8; @@ -1813,9 +1813,9 @@ static uint32_t lpc17_calcethcrc(const uint8_t *data, size_t length) int j; crc = 0xffffffff; - for (i = 0; i < frame_len; i++) + for (i = 0; i < length; i++) { - byte = *frame_no_fcs++; + byte = *data++; for (j = 0; j < 2; j++) { if (((crc >> 28) ^ (byte >> 3)) & 0x00000001) |