[Glibc-bsd-commits] r4958 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-09-21 18:05:44 +0000 (Sat, 21 Sep 2013)
New Revision: 4958

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Add <kglue/netinet/if_ether.h> using patch from original port.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-09-21 17:55:46 UTC (rev 4957)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-09-21 18:05:44 UTC (rev 4958)
@@ -4,6 +4,7 @@
   * sys_timex.c: Check <sys/timex.h> buildability.
   * Move <sys/kern> to <kglue/sys> to make its origin clearer and make
     room for <kglue/netinet>, etc.
+  * Add <kglue/netinet/if_ether.h> using patch from original port.
 
  -- Robert Millan <rmh at debian.org>  Sat, 21 Sep 2013 17:07:34 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2013-09-21 17:55:46 UTC (rev 4957)
+++ trunk/kfreebsd-kernel-headers/debian/install	2013-09-21 18:05:44 UTC (rev 4958)
@@ -122,6 +122,7 @@
 sys/netgraph/netflow/*.h                usr/include/netgraph/netflow
 sys/netinet/icmp_var.h                  usr/include/netinet
 sys/netinet/if_atm.h                    usr/include/netinet
+sys/netinet/if_ether.h			usr/include/kglue/netinet
 sys/netinet/igmp_var.h                  usr/include/netinet
 sys/netinet/in_gif.h                    usr/include/netinet
 sys/netinet/in_pcb.h                    usr/include/netinet

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2013-09-21 17:55:46 UTC (rev 4957)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2013-09-21 18:05:44 UTC (rev 4958)
@@ -692,3 +692,88 @@
  /*
   *	Types defined:
   *
+--- a/sys/netinet/if_ether.h
++++ b/sys/netinet/if_ether.h
+@@ -30,11 +30,9 @@
+  * $FreeBSD$
+  */
+ 
+-#ifndef _NETINET_IF_ETHER_H_
+-#define _NETINET_IF_ETHER_H_
+-
+ #include <net/ethernet.h>
+ #include <net/if_arp.h>
++#include <netinet/in.h>
+ 
+ /*
+  * Macro to map an IP multicast address to an Ethernet multicast address.
+@@ -43,7 +41,7 @@
+  */
+ #define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \
+ 	/* struct in_addr *ipaddr; */ \
+-	/* unsigned char enaddr[ETHER_ADDR_LEN];	   */ \
++	/* unsigned char enaddr[ETH_ALEN];	   */ \
+ { \
+ 	(enaddr)[0] = 0x01; \
+ 	(enaddr)[1] = 0x00; \
+@@ -59,7 +57,7 @@
+  */
+ #define ETHER_MAP_IPV6_MULTICAST(ip6addr, enaddr)			\
+ /* struct	in6_addr *ip6addr; */					\
+-/* unsigned char	enaddr[ETHER_ADDR_LEN]; */				\
++/* unsigned char	enaddr[ETH_ALEN]; */				\
+ {                                                                       \
+ 	(enaddr)[0] = 0x33;						\
+ 	(enaddr)[1] = 0x33;						\
+@@ -69,6 +67,7 @@
+ 	(enaddr)[5] = ((unsigned char *)ip6addr)[15];				\
+ }
+ 
++__BEGIN_DECLS
+ /*
+  * Ethernet Address Resolution Protocol.
+  *
+@@ -78,9 +77,9 @@
+  */
+ struct	ether_arp {
+ 	struct	arphdr ea_hdr;	/* fixed-size header */
+-	unsigned char	arp_sha[ETHER_ADDR_LEN];	/* sender hardware address */
++	unsigned char	arp_sha[ETH_ALEN];	/* sender hardware address */
+ 	unsigned char	arp_spa[4];	/* sender protocol address */
+-	unsigned char	arp_tha[ETHER_ADDR_LEN];	/* target hardware address */
++	unsigned char	arp_tha[ETH_ALEN];	/* target hardware address */
+ 	unsigned char	arp_tpa[4];	/* target protocol address */
+ };
+ #define	arp_hrd	ea_hdr.ar_hrd
+@@ -90,9 +89,8 @@
+ #define	arp_op	ea_hdr.ar_op
+ 
+ struct sockaddr_inarp {
+-	unsigned char	sin_len;
+-	unsigned char	sin_family;
+-	unsigned short sin_port;
++	__SOCKADDR_COMMON (sin_);
++	in_port_t sin_port;		/* Port number.  */
+ 	struct	in_addr sin_addr;
+ 	struct	in_addr sin_srcaddr;
+ 	unsigned short	sin_tos;
+@@ -105,9 +103,11 @@
+ #define	RTF_USETRAILERS	RTF_PROTO1	/* use trailers */
+ #define RTF_ANNOUNCE	RTF_PROTO2	/* announce new arp entry */
+ 
++__END_DECLS
++
+ #ifdef	_KERNEL
+-extern unsigned char	ether_ipmulticast_min[ETHER_ADDR_LEN];
+-extern unsigned char	ether_ipmulticast_max[ETHER_ADDR_LEN];
++extern unsigned char	ether_ipmulticast_min[ETH_ALEN];
++extern unsigned char	ether_ipmulticast_max[ETH_ALEN];
+ 
+ struct llentry;
+ struct ifaddr;
+@@ -118,5 +118,3 @@
+ void	arp_ifinit(struct ifnet *, struct ifaddr *);
+ void	arp_ifinit2(struct ifnet *, struct ifaddr *, unsigned char *);
+ #endif
+-
+-#endif

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2013-09-21 17:55:46 UTC (rev 4957)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2013-09-21 18:05:44 UTC (rev 4958)
@@ -76,6 +76,7 @@
 		-e 's/#\s*include\s\+<sys\/time\.h>\s*/#include <kglue\/sys\/time.h>/g' \
 		-e 's/#\s*include\s\+<sys\/param\.h>\s*/#include <kglue\/sys\/param.h>/g' \
 		-e 's/#\s*include\s\+<sys\/queue\.h>\s*/#include <kglue\/sys\/queue.h>/g' \
+		-e 's/#\s*include\s\+<netinet\/if_ether\.h>\s*/#include <kglue\/netinet\/if_ether.h>/g' \
 		-e 's/#\s*include\s\+<sys\/_termios\.h>\s*/#include <sys\/termios.h>/g' \
 		\
 		-e 's/__size_t/__this_is_a_temporary_kludge__size_t/g' $(shell ## see rev 184135 in GCC SVN ##) \