[Glibc-bsd-commits] r5347 - in trunk: kfreebsd-11/debian/patches kfreebsd-kernel-headers/debian kfreebsd-kernel-headers/debian/patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-18 22:17:18 +0000 (Sat, 18 Jan 2014)
New Revision: 5347

Modified:
   trunk/kfreebsd-11/debian/patches/userland.diff
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/merged.diff
Log:
Enable FreeBSD-style net80211 ioctls.

Modified: trunk/kfreebsd-11/debian/patches/userland.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/userland.diff	2014-01-18 16:10:08 UTC (rev 5346)
+++ trunk/kfreebsd-11/debian/patches/userland.diff	2014-01-18 22:17:18 UTC (rev 5347)
@@ -1163,3 +1163,33 @@
 +#endif
 +
  #endif /* !_SYS_SIGNAL_H_ */
+--- a/sys/net80211/ieee80211_ioctl.h
++++ b/sys/net80211/ieee80211_ioctl.h
+@@ -575,7 +575,7 @@
+ 	uint16_t	sv_vlan;
+ };
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ /*
+  * FreeBSD-style ioctls.
+  */
+@@ -856,6 +856,6 @@
+ #define	IEEE80211_CLONE_WDSLEGACY	0x0004	/* legacy WDS processing */
+ #define	IEEE80211_CLONE_MACADDR		0x0008	/* use specified mac addr */
+ #define	IEEE80211_CLONE_TDMA		0x0010	/* operate in TDMA mode */
+-#endif /* __FreeBSD__ */
++#endif /* __FreeBSD__ || __FreeBSD_kernel__ */
+ 
+ #endif /* _NET80211_IEEE80211_IOCTL_H_ */
+--- a/sys/net80211/ieee80211_var.h
++++ b/sys/net80211/ieee80211_var.h
+@@ -34,7 +34,7 @@
+ /* NB: portability glue must go first */
+ #if defined(__NetBSD__)
+ #include <net80211/ieee80211_netbsd.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <net80211/ieee80211_freebsd.h>
+ #elif defined(__linux__)
+ #include <net80211/ieee80211_linux.h>

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2014-01-18 16:10:08 UTC (rev 5346)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2014-01-18 22:17:18 UTC (rev 5347)
@@ -1,6 +1,7 @@
 kfreebsd-kernel-headers (10.0~3) UNRELEASED; urgency=low
 
   * Expose SIZE_T_MAX, OFF_MAX and OFF_MIN. Add limits.c test to verify.
+  * Enable FreeBSD-style net80211 ioctls.
 
  -- Robert Millan <rmh at debian.org>  Sat, 18 Jan 2014 16:37:25 +0100
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/merged.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/merged.diff	2014-01-18 16:10:08 UTC (rev 5346)
+++ trunk/kfreebsd-kernel-headers/debian/patches/merged.diff	2014-01-18 22:17:18 UTC (rev 5347)
@@ -17,3 +17,33 @@
  #define	GID_MAX		UINT_MAX	/* max value for a gid_t */
  #define	UID_MAX		UINT_MAX	/* max value for a uid_t */
  
+--- a/sys/net80211/ieee80211_ioctl.h
++++ b/sys/net80211/ieee80211_ioctl.h
+@@ -575,7 +575,7 @@
+ 	uint16_t	sv_vlan;
+ };
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ /*
+  * FreeBSD-style ioctls.
+  */
+@@ -856,6 +856,6 @@
+ #define	IEEE80211_CLONE_WDSLEGACY	0x0004	/* legacy WDS processing */
+ #define	IEEE80211_CLONE_MACADDR		0x0008	/* use specified mac addr */
+ #define	IEEE80211_CLONE_TDMA		0x0010	/* operate in TDMA mode */
+-#endif /* __FreeBSD__ */
++#endif /* __FreeBSD__ || __FreeBSD_kernel__ */
+ 
+ #endif /* _NET80211_IEEE80211_IOCTL_H_ */
+--- a/sys/net80211/ieee80211_var.h
++++ b/sys/net80211/ieee80211_var.h
+@@ -34,7 +34,7 @@
+ /* NB: portability glue must go first */
+ #if defined(__NetBSD__)
+ #include <net80211/ieee80211_netbsd.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <net80211/ieee80211_freebsd.h>
+ #elif defined(__linux__)
+ #include <net80211/ieee80211_linux.h>