Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)

- Fix for possible unset uid/gid in toproto
 - Fix for default mtree style
 - Update libelf
 - Importing libexecinfo
 - Resynchronize GCC, mpc, gmp, mpfr
 - build.sh: Replace params with show-params.
     This has been done as the make target has been renamed in the same
     way, while a new target named params has been added. This new
     target generates a file containing all the parameters, instead of
     printing it on the console.
 - Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
     get getservbyport() out of the inner loop

Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091

sys/net/Makefile

@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.31 2012/09/27 18:28:56 alnsn Exp $
+#	$NetBSD: Makefile,v 1.32 2012/10/27 22:36:14 alnsn Exp $
 
-#LSC: radix.h and route.h are used in libsa but not installed
+#LSC: (MINIX) radix.h and route.h are used in libsa but not installed
 
 INCSDIR= /usr/include/net
 
@@ -11,8 +11,12 @@ INCS=	ethertypes.h \
 	\
 	
 
-#SUBDIR=	agr npf
+.if !defined(__MINIX)
+SUBDIR=	agr npf
+.endif # !defined(__MINIX)
 
 .include <bsd.kinc.mk>
 
-#.PATH: ${NETBSDSRCDIR}/sys/dist/pf/net
+.if !defined(__MINIX)
+.PATH: ${NETBSDSRCDIR}/sys/dist/pf/net
+.endif # !defined(__MINIX)

sys/net/if_ether.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ether.h,v 1.59 2012/09/30 05:08:08 dholland Exp $	*/
+/*	$NetBSD: if_ether.h,v 1.61 2012/10/31 10:17:34 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -70,10 +70,10 @@ struct ether_addr {
 	uint8_t ether_addr_octet[ETHER_ADDR_LEN];
 } __packed;
 
-#ifdef __minix
+#if defined(__minix)
 #define ea_addr ether_addr_octet
 typedef struct ether_addr ether_addr_t;
-#endif
+#endif /* defined(__minix) */
 
 /*
  * Structure of a 10Mb/s Ethernet header.
@@ -158,7 +158,7 @@ struct ethercom;
 
 typedef int (*ether_cb_t)(struct ethercom *);
 
-#ifndef __minix
+#if !defined(__minix)
 /*
  * Structure shared between the ethernet driver modules and
  * the multicast list code.  For example, each ec_softc or il_softc
@@ -188,12 +188,27 @@ struct ethercom {
 	struct	mowner ec_tx_mowner;		/* mbufs transmitted */
 #endif
 };
-#endif
+#endif /* !defined(__minix) */
 
 #define	ETHERCAP_VLAN_MTU	0x00000001	/* VLAN-compatible MTU */
 #define	ETHERCAP_VLAN_HWTAGGING	0x00000002	/* hardware VLAN tag support */
 #define	ETHERCAP_JUMBO_MTU	0x00000004	/* 9000 byte MTU supported */
 
+#if !defined(__minix)
+#define	ECCAPBITS		\
+	"\020"			\
+	"\1VLAN_MTU"		\
+	"\2VLAN_HWTAGGING"	\
+	"\3JUMBO_MTU"
+
+/* ioctl() for Ethernet capabilities */
+struct eccapreq {
+	char		eccr_name[IFNAMSIZ];	/* if name, e.g. "en0" */
+	int		eccr_capabilities;	/* supported capabiliites */
+	int		eccr_capenable;		/* capabilities enabled */
+};
+#endif /* !defined(__minix) */
+
 #ifdef	_KERNEL
 extern const uint8_t etherbroadcastaddr[ETHER_ADDR_LEN];
 extern const uint8_t ethermulticastaddr_slowprotocols[ETHER_ADDR_LEN];
@@ -205,9 +220,10 @@ int	ether_ioctl(struct ifnet *, u_long, void *);
 int	ether_addmulti(const struct sockaddr *, struct ethercom *);
 int	ether_delmulti(const struct sockaddr *, struct ethercom *);
 int	ether_multiaddr(const struct sockaddr *, uint8_t[], uint8_t[]);
+void    ether_input(struct ifnet *, struct mbuf *);
 #endif /* _KERNEL */
 
-#ifndef __minix
+#if !defined(__minix)
 /*
  * Ethernet multicast address structure.  There is one of these for each
  * multicast address or range of multicast addresses that we are supposed
@@ -220,7 +236,7 @@ struct ether_multi {
 	u_int	 enm_refcount;		/* no. claims to this addr/range */
 	LIST_ENTRY(ether_multi) enm_list;
 };
-#endif
+#endif /* !defined(__minix) */
 
 /*
  * Structure used by macros below to remember position when stepping through

sys/net/route.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: route.h,v 1.81 2012/02/18 23:47:48 rmind Exp $	*/
+/*	$NetBSD: route.h,v 1.82 2013/03/01 18:25:57 joerg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -147,7 +147,7 @@ struct ortentry {
 #define RTF_MASK	0x80		/* subnet mask present */
 #define RTF_CLONING	0x100		/* generate new routes on use */
 #define RTF_XRESOLVE	0x200		/* external daemon resolves name */
-#define RTF_LLINFO	0x400		/* generated by ARP or ESIS */
+#define RTF_LLINFO	0x400		/* generated by ARP */
 #define RTF_STATIC	0x800		/* manually added */
 #define RTF_BLACKHOLE	0x1000		/* just discard pkts (during updates) */
 #define	RTF_CLONED	0x2000		/* this is a cloned route */
@@ -282,7 +282,7 @@ struct rt_addrinfo {
 struct route_cb {
 	int	ip_count;
 	int	ip6_count;
-	int	iso_count;
+	int	unused1;
 	int	mpls_count;
 	int	any_count;
 };