Module Name: src
Committed By: christos
Date: Wed Sep 11 23:15:47 UTC 2013
Modified Files:
src/sys/netinet6: in6.c
Log Message:
Include BRDADDR and NETMASK to the v4 ioctls we ban for v6; from FreeBSD.
Remove X25 stuff which has been GC'ed.
XXX: pullup-5,6
To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/sys/netinet6/in6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.166 src/sys/netinet6/in6.c:1.167
--- src/sys/netinet6/in6.c:1.166 Sat Jun 29 17:06:58 2013
+++ src/sys/netinet6/in6.c Wed Sep 11 19:15:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.166 2013/06/29 21:06:58 rmind Exp $ */
+/* $NetBSD: in6.c,v 1.167 2013/09/11 23:15:47 christos Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.166 2013/06/29 21:06:58 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.167 2013/09/11 23:15:47 christos Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -377,9 +377,8 @@ in6_control1(struct socket *so, u_long c
*/
case SIOCSIFADDR:
case SIOCSIFDSTADDR:
-#ifdef SIOCSIFCONF_X25
- case SIOCSIFCONF_X25:
-#endif
+ case SIOCSIFBRDADDR:
+ case SIOCSIFNETMASK:
return EOPNOTSUPP;
case SIOCGETSGCNT_IN6:
case SIOCGETMIFCNT_IN6:
