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/drivers/net | |
| parent | 8eb364cb976a72a27459f83692b56d6eed834e4d (diff) | |
| download | px4-nuttx-b50f13c1217e62453224096279dff2c8b1248b13.tar.gz px4-nuttx-b50f13c1217e62453224096279dff2c8b1248b13.tar.bz2 px4-nuttx-b50f13c1217e62453224096279dff2c8b1248b13.zip | |
Remove use of NET_LL_HDRLEN from Ethernet drivers. Use ETH_HDRLEN instead
Diffstat (limited to 'nuttx/drivers/net')
| -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 |
4 files changed, 3 insertions, 7 deletions
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 |