[Glibc-bsd-commits] r5411 - trunk/glibc-ports/kfreebsd/net

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-02-03 22:27:06 +0000 (Mon, 03 Feb 2014)
New Revision: 5411

Modified:
   trunk/glibc-ports/kfreebsd/net/if.h
Log:
Remove struct ifaliasreq, struct ifmediareq and struct ifdrv.

These structs are intimately tied to SIOCAIFADDR/SIOCSIFPHYADDR,
SIOCGIFMEDIA and SIOCSDRVSPEC/SIOCGDRVSPEC ioctls, which are
defined by kfreebsd headers (<sys/sockio.h>). Upstream may freely
change ABI of those ioctls (see upstream rev 228768), causing
severe breakage when our userland is built with mixed definitions
(see for example #736238).



Modified: trunk/glibc-ports/kfreebsd/net/if.h
===================================================================
--- trunk/glibc-ports/kfreebsd/net/if.h	2014-02-03 22:24:42 UTC (rev 5410)
+++ trunk/glibc-ports/kfreebsd/net/if.h	2014-02-03 22:27:06 UTC (rev 5411)
@@ -339,30 +339,8 @@
 	 (sizeof(struct ifreq) - sizeof(struct sockaddr) + \
 	  (ifr).ifr_addr.sa_len) : sizeof(struct ifreq))
 
-struct ifaliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr ifra_addr;
-	struct	sockaddr ifra_broadaddr;
-	struct	sockaddr ifra_mask;
-};
+#include <sys/kglue/net/if.h>
 
-struct ifmediareq {
-	char	ifm_name[IFNAMSIZ];	/* if name, e.g. "en0" */
-	int	ifm_current;		/* current media options */
-	int	ifm_mask;		/* don't care mask */
-	int	ifm_status;		/* media status */
-	int	ifm_active;		/* active options */
-	int	ifm_count;		/* # entries in ifm_ulist array */
-	int	*ifm_ulist;		/* media words */
-};
-
-struct  ifdrv {
-	char            ifd_name[IFNAMSIZ];     /* if name, e.g. "en0" */
-	unsigned long   ifd_cmd;
-	size_t          ifd_len;
-	void            *ifd_data;
-};
-
 /*
  * Structure used to retrieve aux status data from interfaces.
  * Kernel suppliers to this interface should respect the formatting