diff options
-rw-r--r-- | nuttx/net/netdev-findbyaddr.c | 5 | ||||
-rw-r--r-- | nuttx/net/uip/uip-icmpping.c | 1 | ||||
-rw-r--r-- | nuttx/netutils/tftpc/tftpc_get.c | 2 | ||||
-rw-r--r-- | nuttx/netutils/tftpc/tftpc_put.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/nuttx/net/netdev-findbyaddr.c b/nuttx/net/netdev-findbyaddr.c index 0167f6312..ff4cd7a6d 100644 --- a/nuttx/net/netdev-findbyaddr.c +++ b/nuttx/net/netdev-findbyaddr.c @@ -73,8 +73,9 @@ * Function: netdev_maskcmp ****************************************************************************/ -static inline boolean netdev_maskcmp(uip_ipaddr_t *ipaddr, uip_ipaddr_t *raddr, - uip_ipaddr_t *netmask) +static inline boolean netdev_maskcmp(const uip_ipaddr_t *ipaddr, + const uip_ipaddr_t *raddr, + const uip_ipaddr_t *netmask) { #ifndef CONFIG_NET_IPv6 return (*ipaddr & *netmask) == (*raddr & *netmask); diff --git a/nuttx/net/uip/uip-icmpping.c b/nuttx/net/uip/uip-icmpping.c index 3029e2fc2..fa6f44f60 100644 --- a/nuttx/net/uip/uip-icmpping.c +++ b/nuttx/net/uip/uip-icmpping.c @@ -52,6 +52,7 @@ #include <net/uip/uip-arch.h> #include "uip-internal.h" +#include "../net-internal.h" /* Should not include this! */ /**************************************************************************** * Definitions diff --git a/nuttx/netutils/tftpc/tftpc_get.c b/nuttx/netutils/tftpc/tftpc_get.c index bb2f96267..584664599 100644 --- a/nuttx/netutils/tftpc/tftpc_get.c +++ b/nuttx/netutils/tftpc/tftpc_get.c @@ -262,7 +262,7 @@ int tftpget(const char *remote, const char *local, in_addr_t addr, boolean binar /* Parse the incoming DATA packet */ if (nbytesrecvd < TFTP_DATAHEADERSIZE || - tftp_parsedatapacket(packet, &opcode, &blockno) != OK || + tftp_parsedatapacket(packet, &opcode, &rblockno) != OK || blockno != rblockno) { nvdbg("Parse failure\n"); diff --git a/nuttx/netutils/tftpc/tftpc_put.c b/nuttx/netutils/tftpc/tftpc_put.c index 1d19a2d74..ca158a783 100644 --- a/nuttx/netutils/tftpc/tftpc_put.c +++ b/nuttx/netutils/tftpc/tftpc_put.c @@ -96,7 +96,7 @@ static inline int tftp_incrndx(int ndx) static inline ssize_t tftp_read(int fd, ubyte *buf, size_t buflen) { ssize_t nbytesread; - ssize_t totalread; + ssize_t totalread = 0; while (totalread < buflen) { |