summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2005-04-14 14:27:21 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2005-04-14 14:27:21 +0000
commitf75c85e4e75c8314e529c8e3f32d2eb696056233 (patch)
tree2f03f8bbdf3a71104a0cda3750b5e8ceb9f44ee4
parent2005-04-14 Ralf Corsepius <ralf.corsepius@rtems.org> (diff)
downloadrtems-f75c85e4e75c8314e529c8e3f32d2eb696056233.tar.bz2
Cosmetical update from FreeBSD.
-rw-r--r--cpukit/libnetworking/arpa/inet.h8
-rw-r--r--cpukit/libnetworking/net/if_dl.h16
2 files changed, 13 insertions, 11 deletions
diff --git a/cpukit/libnetworking/arpa/inet.h b/cpukit/libnetworking/arpa/inet.h
index ad5332e7ab..9dbed521b9 100644
--- a/cpukit/libnetworking/arpa/inet.h
+++ b/cpukit/libnetworking/arpa/inet.h
@@ -47,12 +47,14 @@
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
+ *
+ * @(#)inet.h 8.1 (Berkeley) 6/2/93
+ * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
+ * $FreeBSD: src/include/arpa/inet.h,v 1.25 2002/08/21 16:19:56 mike Exp $
*/
/*
- * @(#)inet.h 8.1 (Berkeley) 6/2/93
- * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- * $Id$
+ * $Id$
*/
#ifndef _ARPA_INET_H_
diff --git a/cpukit/libnetworking/net/if_dl.h b/cpukit/libnetworking/net/if_dl.h
index d99d15097b..e739316be8 100644
--- a/cpukit/libnetworking/net/if_dl.h
+++ b/cpukit/libnetworking/net/if_dl.h
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,6 +27,10 @@
* SUCH DAMAGE.
*
* @(#)if_dl.h 8.1 (Berkeley) 6/10/93
+ * $FreeBSD: src/sys/net/if_dl.h,v 1.14 2005/01/07 01:45:34 imp Exp $
+ */
+
+/*
* $Id$
*/
@@ -60,13 +60,13 @@
*/
struct sockaddr_dl {
u_char sdl_len; /* Total length of sockaddr */
- u_char sdl_family; /* AF_DLI */
+ u_char sdl_family; /* AF_LINK */
u_short sdl_index; /* if != 0, system given index for interface */
u_char sdl_type; /* interface type */
u_char sdl_nlen; /* interface name length, no trailing 0 reqd. */
u_char sdl_alen; /* link level address length */
u_char sdl_slen; /* link layer selector length */
- char sdl_data[12]; /* minimum work area, can be larger;
+ char sdl_data[46]; /* minimum work area, can be larger;
contains both if name and ll address */
};
@@ -77,8 +77,8 @@ struct sockaddr_dl {
#include <sys/cdefs.h>
__BEGIN_DECLS
-void link_addr __P((const char *, struct sockaddr_dl *));
-char *link_ntoa __P((const struct sockaddr_dl *));
+void link_addr(const char *, struct sockaddr_dl *);
+char *link_ntoa(const struct sockaddr_dl *);
__END_DECLS
#endif /* !_KERNEL */