diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-05 13:04:48 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-05 13:04:48 -0600 |
| commit | 2c65ea8325718f37ee4c21f7acd8b3671b6d39c6 (patch) | |
| tree | b7d6ddf9571f7c52b9942831dcc3deff4f7092f2 /nuttx/drivers | |
| parent | 73d3d807bf41f61f9a35c96b1fdc8c0d62c7c40a (diff) | |
| download | px4-nuttx-2c65ea8325718f37ee4c21f7acd8b3671b6d39c6.tar.gz px4-nuttx-2c65ea8325718f37ee4c21f7acd8b3671b6d39c6.tar.bz2 px4-nuttx-2c65ea8325718f37ee4c21f7acd8b3671b6d39c6.zip | |
NET: Standardize naming of all protocal header lengths
Diffstat (limited to 'nuttx/drivers')
| -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 | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c index 093a84807..ce2753287 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_LLH_LEN || rx.desc.rx_len > (CONFIG_NET_BUFSIZE + 2)) + else if (rx.desc.rx_len < NET_LL_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 ed5ea8379..e0a1f207d 100644 --- a/nuttx/drivers/net/enc28j60.c +++ b/nuttx/drivers/net/enc28j60.c @@ -1483,7 +1483,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_LLH_LEN + 4)) + else if (pktlen > (CONFIG_NET_BUFSIZE + 4) || pktlen <= (NET_LL_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 3c1b5c43a..45eca23e9 100644 --- a/nuttx/drivers/net/encx24j600.c +++ b/nuttx/drivers/net/encx24j600.c @@ -1650,7 +1650,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_LLH_LEN + 4)) + else if (pktlen > (CONFIG_NET_BUFSIZE + 4) || pktlen <= (NET_LL_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 b7c70af36..0780581a6 100644 --- a/nuttx/drivers/net/slip.c +++ b/nuttx/drivers/net/slip.c @@ -73,8 +73,8 @@ /* Configuration ************************************************************/ -#if NET_LLH_LEN > 0 -# error "NET_LLH_LEN must be set to zero" +#if NET_LL_HDRLEN > 0 +# error "NET_LL_HDRLEN must be set to zero" #endif #ifndef CONFIG_NET_NOINTS @@ -708,7 +708,7 @@ static int slip_rxtask(int argc, char *argv[]) * enough to hold an IP header. */ - if (priv->rxlen >= IPHDR_LEN) + if (priv->rxlen >= IP_HDRLEN) { /* Handle the IP input. Get exclusive access to uIP. */ |