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

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-02-03 18:33:56 +0000 (Mon, 03 Feb 2014)
New Revision: 5408

Modified:
   trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff
   trunk/kfreebsd-kernel-headers/test/net_if.c
Log:
Actually provide the structs...

Modified: trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff	2014-02-03 18:27:25 UTC (rev 5407)
+++ trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff	2014-02-03 18:33:56 UTC (rev 5408)
@@ -1,7 +1,14 @@
 --- a/sys/net/if.h
 +++ b/sys/net/if.h
-@@ -35,6 +35,15 @@
+@@ -30,11 +30,20 @@
+  * $FreeBSD$
+  */
  
+-#ifndef _NET_IF_H_
+-#define	_NET_IF_H_
++#ifndef _FREEBSD_NET_IF_H_
++#define	_FREEBSD_NET_IF_H_
+ 
  #include <sys/cdefs.h>
  
 +/* Disable everything except for:
@@ -16,7 +23,15 @@
  #ifdef _KERNEL
  #include <sys/kglue/sys/queue.h>
  #endif
-@@ -410,6 +419,8 @@
+@@ -62,7 +71,6 @@
+ #define		IFNAMSIZ	IF_NAMESIZE
+ #define		IF_MAXUNIT	0x7fff	/* historical value */
+ #endif
+-#if __BSD_VISIBLE
+ 
+ /*
+  * Structure used to query names of interface cloners.
+@@ -410,6 +418,8 @@
  	 (sizeof(struct ifreq) - sizeof(struct sockaddr) + \
  	  (ifr).ifr_addr.sa_len) : sizeof(struct ifreq))
  
@@ -25,7 +40,7 @@
  struct ifaliasreq {
  	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
  	struct	sockaddr ifra_addr;
-@@ -443,6 +454,8 @@
+@@ -443,6 +453,8 @@
  	void            *ifd_data;
  };
  
@@ -34,7 +49,16 @@
  /* 
   * Structure used to retrieve aux status data from interfaces.
   * Kernel suppliers to this interface should respect the formatting
-@@ -543,4 +556,6 @@
+@@ -515,8 +527,6 @@
+ 	struct	sockaddr_storage dstaddr; /* out */
+ };
+ 
+-#endif /* __BSD_VISIBLE */
+-
+ #ifdef _KERNEL
+ #ifdef MALLOC_DECLARE
+ MALLOC_DECLARE(M_IFADDR);
+@@ -543,4 +553,6 @@
  #include <net/if_var.h>
  #endif
  

Modified: trunk/kfreebsd-kernel-headers/test/net_if.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/net_if.c	2014-02-03 18:27:25 UTC (rev 5407)
+++ trunk/kfreebsd-kernel-headers/test/net_if.c	2014-02-03 18:33:56 UTC (rev 5408)
@@ -1,2 +1,11 @@
+#define ifaliasreq	gnu_ifaliasreq
+#define ifmediareq	gnu_ifmediareq
+#define ifdrv		gnu_ifdrv
 #include <net/if.h>
+#undef ifaliasreq
+#undef ifmediareq
+#undef ifdrv
+
 #include <sys/kglue/net/if.h>
+#include "assert.h"
+COMPILE_TIME_ASSERT(ifaliasreq_size, sizeof(struct ifaliasreq) == sizeof(struct oifaliasreq) + sizeof(int));