Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.116.2.3
retrieving revision 1.116.2.4
diff -u -p -r1.116.2.3 -r1.116.2.4
--- src/sys/netinet/raw_ip.c	2013/09/23 00:57:53	1.116.2.3
+++ src/sys/netinet/raw_ip.c	2014/05/18 17:46:13	1.116.2.4
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.116.2.3 2013/09/23 00:57:53 rmind Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.116.2.4 2014/05/18 17:46:13 rmind Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.116.2.3 2013/09/23 00:57:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.116.2.4 2014/05/18 17:46:13 rmind Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -509,9 +509,9 @@ rip_bind(inpcb_t *inp, struct mbuf *nam)
 	struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
 
 	if (nam->m_len != sizeof(*addr))
-		return EINVAL;
+		return (EINVAL);
 	if (!IFNET_FIRST())
-		return EADDRNOTAVAIL;
+		return (EADDRNOTAVAIL);
 	if (addr->sin_family != AF_INET)
 		return EAFNOSUPPORT;
 	if (!in_nullhost(addr->sin_addr) && !ifa_ifwithaddr(sintosa(addr)))
@@ -527,9 +527,9 @@ rip_connect(inpcb_t *inp, struct mbuf *n
 	struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
 
 	if (nam->m_len != sizeof(*addr))
-		return EINVAL;
+		return (EINVAL);
 	if (!IFNET_FIRST())
-		return EADDRNOTAVAIL;
+		return (EADDRNOTAVAIL);
 	if (addr->sin_family != AF_INET)
 		return EAFNOSUPPORT;
 
@@ -732,11 +732,6 @@ sysctl_net_inet_raw_setup(struct sysctll
 {
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
-		       CTLTYPE_NODE, "net", NULL,
-		       NULL, 0, NULL, 0,
-		       CTL_NET, CTL_EOL);
-	sysctl_createv(clog, 0, NULL, NULL,
-		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "inet", NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_NET, PF_INET, CTL_EOL);