[Glibc-bsd-commits] r5406 - in trunk/kfreebsd-kernel-headers: debian debian/patches test

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-02-03 17:57:22 +0000 (Mon, 03 Feb 2014)
New Revision: 5406

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff
   trunk/kfreebsd-kernel-headers/test/net_if.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/patches/series
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Add <net/if.h>, providing only struct ifaliasreq, struct oifaliasreq, struct ifmediareq and struct ifdrv. Add a test for collisions with GNU <net/if.h>.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2014-01-31 03:37:56 UTC (rev 5405)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2014-02-03 17:57:22 UTC (rev 5406)
@@ -1,3 +1,11 @@
+kfreebsd-kernel-headers (10.0~4) UNRELEASED; urgency=low
+
+  * Add <net/if.h>, providing only struct ifaliasreq, struct
+    oifaliasreq, struct ifmediareq and struct ifdrv. Add a test for
+    collisions with GNU <net/if.h>.
+
+ -- Robert Millan <rmh at debian.org>  Mon, 03 Feb 2014 18:57:12 +0100
+
 kfreebsd-kernel-headers (10.0~3) experimental; urgency=low
 
   * Expose SIZE_T_MAX, OFF_MAX and OFF_MIN. Add limits.c test to verify.

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2014-01-31 03:37:56 UTC (rev 5405)
+++ trunk/kfreebsd-kernel-headers/debian/install	2014-02-03 17:57:22 UTC (rev 5406)
@@ -61,6 +61,7 @@
 sys/net/bpf.h                           usr/include/net
 sys/net/bpfdesc.h                       usr/include/net
 sys/net/bridgestp.h                     usr/include/net
+sys/net/if.h				usr/include/sys/kglue/net
 sys/net/if_arc.h                        usr/include/net
 sys/net/if_arp.h                        usr/include/net
 sys/net/if_atm.h                        usr/include/net

Added: trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff	2014-02-03 17:57:22 UTC (rev 5406)
@@ -0,0 +1,43 @@
+--- a/sys/net/if.h
++++ b/sys/net/if.h
+@@ -35,6 +35,15 @@
+ 
+ #include <sys/cdefs.h>
+ 
++/* Disable everything except for:
++struct ifaliasreq {
++struct oifaliasreq {
++struct ifmediareq {
++struct  ifdrv {
++*/
++
++#if 0
++
+ #ifdef _KERNEL
+ #include <sys/kglue/sys/queue.h>
+ #endif
+@@ -410,6 +419,8 @@
+ 	 (sizeof(struct ifreq) - sizeof(struct sockaddr) + \
+ 	  (ifr).ifr_addr.sa_len) : sizeof(struct ifreq))
+ 
++#endif /* 0 */
++
+ struct ifaliasreq {
+ 	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
+ 	struct	sockaddr ifra_addr;
+@@ -443,6 +454,8 @@
+ 	void            *ifd_data;
+ };
+ 
++#if 0
++
+ /* 
+  * Structure used to retrieve aux status data from interfaces.
+  * Kernel suppliers to this interface should respect the formatting
+@@ -543,4 +556,6 @@
+ #include <net/if_var.h>
+ #endif
+ 
++#endif /* 0 */
++
+ #endif /* !_NET_IF_H_ */

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2014-01-31 03:37:56 UTC (rev 5405)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2014-02-03 17:57:22 UTC (rev 5406)
@@ -29,3 +29,4 @@
 050_sigframe.diff
 signal_collision.diff
 sys_kern_backward_compat.diff
+net_if_ioctls.diff

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2014-01-31 03:37:56 UTC (rev 5405)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2014-02-03 17:57:22 UTC (rev 5406)
@@ -20,6 +20,7 @@
 	in_pcb.o \
 	ino_t.o \
 	limits.o \
+	net_if.o \
 	ppp.o \
 	sctp.o \
 	soundcard.o \

Added: trunk/kfreebsd-kernel-headers/test/net_if.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/net_if.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/net_if.c	2014-02-03 17:57:22 UTC (rev 5406)
@@ -0,0 +1,2 @@
+#include <net/if.h>
+#include <sys/kglue/net/if.h>