summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-09-09 13:46:35 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-09-09 13:46:35 +0000
commitee33d383fb7036714820ca65aab3b0fe08aa2130 (patch)
treeaaeb0e2b7cac1c0b2e18520ef65af9ff75c1a558 /nuttx
parent03d19ec22667874fac41953b92b3b3d69815d8ef (diff)
downloadpx4-nuttx-ee33d383fb7036714820ca65aab3b0fe08aa2130.tar.gz
px4-nuttx-ee33d383fb7036714820ca65aab3b0fe08aa2130.tar.bz2
px4-nuttx-ee33d383fb7036714820ca65aab3b0fe08aa2130.zip
Cosmetic, synchronize source files
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2030 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/arch/arm/src/lm3s/lm3s_ethernet.c3
-rw-r--r--nuttx/net/net_poll.c1
-rw-r--r--nuttx/net/uip/uip_tcpcallback.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c b/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c
index eff8554ce..d626166b5 100644
--- a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c
+++ b/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c
@@ -657,6 +657,7 @@ static void lm3s_receive(struct lm3s_driver_s *priv)
/* We will have to drop this packet */
+ ndbg("Bad packet size dropped (%d)\n", pktlen);
EMAC_STAT(priv, rx_pktsize);
/* This is the number of bytes and words left to read (including,
@@ -763,7 +764,7 @@ static void lm3s_receive(struct lm3s_driver_s *priv)
#ifdef CONFIG_DEBUG
else
{
- ndbg("Unsupported packet type dropped (%02x)\n", ETHBUF->type);
+ ndbg("Unsupported packet type dropped (%02x)\n", htons(ETHBUF->type));
EMAC_STAT(priv, rx_dropped);
}
#endif
diff --git a/nuttx/net/net_poll.c b/nuttx/net/net_poll.c
index adbd9c101..fac6186c4 100644
--- a/nuttx/net/net_poll.c
+++ b/nuttx/net/net_poll.c
@@ -325,6 +325,7 @@ int net_poll(int sockfd, struct pollfd *fds, boolean setup)
#endif
/* Check if we are setting up or tearing down the poll */
+
if (setup)
{
/* Perform the TCP/IP poll() setup */
diff --git a/nuttx/net/uip/uip_tcpcallback.c b/nuttx/net/uip/uip_tcpcallback.c
index 45c970a90..600000043 100644
--- a/nuttx/net/uip/uip_tcpcallback.c
+++ b/nuttx/net/uip/uip_tcpcallback.c
@@ -1,7 +1,7 @@
/****************************************************************************
* net/uip/uip_tcpcallback.c
*
- * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without