diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-15 09:05:34 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-15 09:05:34 -0600 |
| commit | b50f13c1217e62453224096279dff2c8b1248b13 (patch) | |
| tree | 4edc4aa14c531b2077040facf6a3ec3d81b2fef5 /nuttx/arch | |
| parent | 8eb364cb976a72a27459f83692b56d6eed834e4d (diff) | |
| download | nuttx-b50f13c1217e62453224096279dff2c8b1248b13.tar.gz nuttx-b50f13c1217e62453224096279dff2c8b1248b13.tar.bz2 nuttx-b50f13c1217e62453224096279dff2c8b1248b13.zip | |
Remove use of NET_LL_HDRLEN from Ethernet drivers. Use ETH_HDRLEN instead
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_ethernet.c | 4 | ||||
| -rw-r--r-- | nuttx/arch/sim/src/up_netdriver.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/tiva/tiva_ethernet.c b/nuttx/arch/arm/src/tiva/tiva_ethernet.c index 1fb19f882..bd297e5a5 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ethernet.c +++ b/nuttx/arch/arm/src/tiva/tiva_ethernet.c @@ -515,7 +515,7 @@ static int tiva_transmit(struct tiva_driver_s *priv) pktlen = priv->ld_dev.d_len; nllvdbg("Sending packet, pktlen: %d\n", pktlen); - DEBUGASSERT(pktlen > NET_LL_HDRLEN); + DEBUGASSERT(pktlen > ETH_HDRLEN); dbuf = priv->ld_dev.d_buf; regval = (uint32_t)(pktlen - 14); @@ -677,7 +677,7 @@ static void tiva_receive(struct tiva_driver_s *priv) * and 4 byte FCS that are not copied into the uIP packet. */ - if (pktlen > (CONFIG_NET_BUFSIZE + 6) || pktlen <= (NET_LL_HDRLEN + 6)) + if (pktlen > (CONFIG_NET_BUFSIZE + 6) || pktlen <= (ETH_HDRLEN + 6)) { int wordlen; diff --git a/nuttx/arch/sim/src/up_netdriver.c b/nuttx/arch/sim/src/up_netdriver.c index 90ff0bb3e..f63233a91 100644 --- a/nuttx/arch/sim/src/up_netdriver.c +++ b/nuttx/arch/sim/src/up_netdriver.c @@ -155,7 +155,7 @@ void netdriver_loop(void) * MAC address */ - if (g_sim_dev.d_len > NET_LL_HDRLEN && up_comparemac(BUF->ether_dhost, &g_sim_dev.d_mac) == 0) + if (g_sim_dev.d_len > ETH_HDRLEN && up_comparemac(BUF->ether_dhost, &g_sim_dev.d_mac) == 0) { /* We only accept IP packets of the configured type and ARP packets */ |