diff options
| -rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_ethernet.c | 4 | ||||
| -rw-r--r-- | nuttx/arch/sim/src/up_netdriver.c | 2 | ||||
| -rw-r--r-- | nuttx/drivers/net/dm90x0.c | 2 | ||||
| -rw-r--r-- | nuttx/drivers/net/enc28j60.c | 2 | ||||
| -rw-r--r-- | nuttx/drivers/net/encx24j600.c | 2 | ||||
| -rw-r--r-- | nuttx/drivers/net/slip.c | 4 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/arp.h | 2 |
7 files changed, 7 insertions, 11 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 */ diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c index 13aaa38ec..38c1773c2 100644 --- a/nuttx/drivers/net/dm90x0.c +++ b/nuttx/drivers/net/dm90x0.c @@ -963,7 +963,7 @@ static void dm9x_receive(struct dm9x_driver_s *dm9x) /* Also check if the packet is a valid size for the uIP configuration */ - else if (rx.desc.rx_len < NET_LL_HDRLEN || rx.desc.rx_len > (CONFIG_NET_BUFSIZE + 2)) + else if (rx.desc.rx_len < ETH_HDRLEN || rx.desc.rx_len > (CONFIG_NET_BUFSIZE + 2)) { #if defined(CONFIG_DM9X_STATS) dm9x->dm_nrxlengtherrors++; diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c index 5c045f1de..9b1463d76 100644 --- a/nuttx/drivers/net/enc28j60.c +++ b/nuttx/drivers/net/enc28j60.c @@ -1487,7 +1487,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv) /* Check for a usable packet length (4 added for the CRC) */ - else if (pktlen > (CONFIG_NET_BUFSIZE + 4) || pktlen <= (NET_LL_HDRLEN + 4)) + else if (pktlen > (CONFIG_NET_BUFSIZE + 4) || pktlen <= (ETH_HDRLEN + 4)) { nlldbg("Bad packet size dropped (%d)\n", pktlen); #ifdef CONFIG_ENC28J60_STATS diff --git a/nuttx/drivers/net/encx24j600.c b/nuttx/drivers/net/encx24j600.c index d4eb7095e..fb0f2eb30 100644 --- a/nuttx/drivers/net/encx24j600.c +++ b/nuttx/drivers/net/encx24j600.c @@ -1656,7 +1656,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv) /* Check for a usable packet length (4 added for the CRC) */ - else if (pktlen > (CONFIG_NET_BUFSIZE + 4) || pktlen <= (NET_LL_HDRLEN + 4)) + else if (pktlen > (CONFIG_NET_BUFSIZE + 4) || pktlen <= (ETH_HDRLEN + 4)) { nlldbg("Bad packet size dropped (%d)\n", pktlen); diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c index 2585ac34c..fc028174a 100644 --- a/nuttx/drivers/net/slip.c +++ b/nuttx/drivers/net/slip.c @@ -74,10 +74,6 @@ /* Configuration ************************************************************/ -#if NET_LL_HDRLEN > 0 -# error "NET_LL_HDRLEN must be set to zero" -#endif - #ifndef CONFIG_NET_NOINTS # warning "CONFIG_NET_NOINTS must be set" #endif diff --git a/nuttx/include/nuttx/net/arp.h b/nuttx/include/nuttx/net/arp.h index b7bddeedb..e42d367d3 100644 --- a/nuttx/include/nuttx/net/arp.h +++ b/nuttx/include/nuttx/net/arp.h @@ -67,7 +67,7 @@ /* Size of the Ethernet header */ -#define ETH_HDRLEN 14 /* Minimum size: 2*6 + 2 */ +#define ETH_HDRLEN 14 /* Minimum size: 2*6 + 2 */ /**************************************************************************** * Public Types |