diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-09-08 22:41:00 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-09-08 22:41:00 +0000 |
commit | 712b9f5349a81fe56fa060ccb8aa13e0db830657 (patch) | |
tree | dfbb89ff177cb40a24945fa3925c9e75230a6a5b /nuttx/net/uip | |
parent | 255e1fe83691a2c5a3328bcec13e2bce0a140696 (diff) | |
download | px4-nuttx-712b9f5349a81fe56fa060ccb8aa13e0db830657.tar.gz px4-nuttx-712b9f5349a81fe56fa060ccb8aa13e0db830657.tar.bz2 px4-nuttx-712b9f5349a81fe56fa060ccb8aa13e0db830657.zip |
Cleanup and fix problems introduce in last commit
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@337 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net/uip')
-rw-r--r-- | nuttx/net/uip/psock.c | 25 | ||||
-rw-r--r-- | nuttx/net/uip/uip-fw.h | 45 | ||||
-rw-r--r-- | nuttx/net/uip/uip-split.h | 44 |
3 files changed, 57 insertions, 57 deletions
diff --git a/nuttx/net/uip/psock.c b/nuttx/net/uip/psock.c index 24269a60a..55676c3c2 100644 --- a/nuttx/net/uip/psock.c +++ b/nuttx/net/uip/psock.c @@ -1,10 +1,18 @@ -/* - * Copyright (c) 2004, Swedish Institute of Computer Science. - * All rights reserved. +/**************************************************************************** + * net/uip/psock.c + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Based on uIP which also has a BSD style license: + * + * Copyright (c) 2004, Swedish Institute of Computer Science. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -26,12 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * This file is part of the uIP TCP/IP stack - * - * Author: Adam Dunkels <adam@sics.se> - * - * $Id: psock.c,v 1.2 2007-09-01 18:06:13 patacongo Exp $ - */ + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ #include <stdio.h> #include <string.h> diff --git a/nuttx/net/uip/uip-fw.h b/nuttx/net/uip/uip-fw.h index cba0bea13..b3153cd31 100644 --- a/nuttx/net/uip/uip-fw.h +++ b/nuttx/net/uip/uip-fw.h @@ -1,21 +1,20 @@ -/** - * \addtogroup uipfw - * @{ - */ - -/** - * \file +/**************************************************************************** + * net/uip/uip-fw.h * uIP packet forwarding header file. - * \author Adam Dunkels <adam@sics.se> - */ - -/* - * Copyright (c) 2004, Swedish Institute of Computer Science. - * All rights reserved. + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Based on uIP which also has a BSD style license: + * + * Author: Adam Dunkels <adam@sics.se> + * Copyright (c) 2004, Swedish Institute of Computer Science. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -37,21 +36,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * This file is part of the uIP TCP/IP stack - * - * Author: Adam Dunkels <adam@sics.se> - * - * $Id: uip-fw.h,v 1.1.1.1 2007-08-26 23:04:07 patacongo Exp $ - */ + ****************************************************************************/ + #ifndef __UIP_FW_H__ #define __UIP_FW_H__ +/**************************************************************************** + * Included Files + ****************************************************************************/ + #include <net/uip/uip.h> -/** - * Representation of a uIP network interface. - */ -struct uip_fw_netif { +/* Representation of a uIP network interface. */ + +struct uip_fw_netif +{ struct uip_fw_netif *next; /**< Pointer to the next interface when linked in a list. */ uint16 ipaddr[2]; /**< The IP address of this interface. */ diff --git a/nuttx/net/uip/uip-split.h b/nuttx/net/uip/uip-split.h index 99f36ccdb..4779b017a 100644 --- a/nuttx/net/uip/uip-split.h +++ b/nuttx/net/uip/uip-split.h @@ -1,10 +1,21 @@ -/* - * Copyright (c) 2004, Swedish Institute of Computer Science. - * All rights reserved. +/**************************************************************************** + * net/uip/uip-split.h + * Module for splitting outbound TCP segments in two to avoid the + * delayed ACK throughput degradation. + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Based on uIP which also has a BSD style license: + * + * Author: Adam Dunkels <adam@sics.se> + * Copyright (c) 2004, Swedish Institute of Computer Science. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -26,20 +37,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * This file is part of the uIP TCP/IP stack - * - * Author: Adam Dunkels <adam@sics.se> - * - * $Id: uip-split.h,v 1.1.1.1 2007-08-26 23:04:08 patacongo Exp $ - */ -/** - * \addtogroup uip - * @{ - */ + ****************************************************************************/ -/** - * \defgroup uipsplit uIP TCP throughput booster hack - * @{ +/* uipsplit uIP TCP throughput booster hack * * The basic uIP TCP implementation only allows each TCP connection to * have a single TCP segment in flight at any given time. Because of @@ -59,15 +59,9 @@ * to work. */ - -/** - * \file - * Module for splitting outbound TCP segments in two to avoid the - * delayed ACK throughput degradation. - * \author - * Adam Dunkels <adam@sics.se> - * - */ +/**************************************************************************** + * Included Files + ****************************************************************************/ #ifndef __UIP_SPLIT_H__ #define __UIP_SPLIT_H__ |