Merge of branches/team/network/new_stack - not yet complete as SVN does only support

replacing files when merging when you don't have deleted them manually (for some reason,
it only works as part of the merge operation, and we didn't copy the whole tree to
have "a fresh start" - next time we know better, at least if SVN still suffers from
that same limitation).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18456 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/posix/net/if_dl.h

@@ -1,38 +1,28 @@
-/* if.h
- * Interface definitions for beos
+/*
+ * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
  */
+#ifndef _NET_IF_DL_H
+#define _NET_IF_DL_H
 
-#ifndef OBOS_IF_DL_H
-#define OBOS_IF_DL_H
 
-#include <net/if.h>
+#include <stdint.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-/* link level sockaddr structure */
+/* Link level sockaddr structure */
 struct sockaddr_dl {
-	uint8	sdl_len;      /* Total length of sockaddr */
-	uint8	sdl_family;   /* AF_LINK */
-	uint16	sdl_index;    /* if != 0, system given index for interface */
-	uint8	sdl_type;     /* interface type */
-	uint8	sdl_nlen;     /* interface name length, no trailing 0 reqd. */
-	uint8	sdl_alen;     /* link level address length */
-	uint8	sdl_slen;     /* link layer selector length */
-	char	sdl_data[24]; /* minimum work area, can be larger;
-                                   contains both if name and ll address */
+	uint8_t		sdl_len;		/* Total length of sockaddr */
+	uint8_t		sdl_family;		/* AF_LINK */
+	uint16_t	sdl_e_type;		/* link level frame type */
+	uint32_t	sdl_index;		/* index for interface */
+	uint8_t		sdl_type;		/* interface type */
+	uint8_t		sdl_nlen;		/* interface name length (not terminated with a null byte) */
+	uint8_t		sdl_alen;		/* link level address length */
+	uint8_t		sdl_slen;		/* link layer selector length */
+	char		sdl_data[20];	/* minimum work area, can be larger */
 };
 
 /* Macro to get a pointer to the link level address */
-#define LLADDR(s)	((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
-
-void    link_addr (const char *, struct sockaddr_dl *);
-char    *link_ntoa (const struct sockaddr_dl *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OBOS_IF_DL_H */
+#define LLADDR(s)	((char *)((s)->sdl_data + (s)->sdl_nlen))
 
+#endif	/* _NET_IF_DL_H */