Module Name: src
Committed By: pooka
Date: Mon May 25 22:49:23 UTC 2009
Modified Files:
src/sys/netinet6: in6_src.c
Log Message:
Remove declaration of unused extern struct ifnet loif[NLOOP], which
was already removed once, but brought back in a wholesale import.
While here, mop up the #ifdef __SomeotherOS__ noise.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/netinet6/in6_src.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_src.c
diff -u src/sys/netinet6/in6_src.c:1.48 src/sys/netinet6/in6_src.c:1.49
--- src/sys/netinet6/in6_src.c:1.48 Tue May 12 22:22:46 2009
+++ src/sys/netinet6/in6_src.c Mon May 25 22:49:23 2009
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.48 2009/05/12 22:22:46 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.49 2009/05/25 22:49:23 pooka Exp $");
#include "opt_inet.h"
@@ -76,14 +76,7 @@
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#ifndef __FreeBSD__
#include <sys/ioctl.h>
-#else
-#include <sys/sockio.h>
-#endif
-#ifdef __FreeBSD__
-#include <sys/sysctl.h>
-#endif
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kernel.h>
@@ -101,9 +94,7 @@
#include <netinet/in_pcb.h>
#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
-#ifndef __OpenBSD__
#include <netinet6/in6_pcb.h>
-#endif
#include <netinet6/ip6_var.h>
#include <netinet6/ip6_private.h>
#include <netinet6/nd6.h>
@@ -120,13 +111,6 @@
#endif /* NMIP > 0 */
#endif /* MIP6 */
-#ifndef __OpenBSD__
-#include "loop.h"
-#endif
-#ifdef __NetBSD__
-extern struct ifnet loif[NLOOP];
-#endif
-
#define ADDR_LABEL_NOTAPP (-1)
struct in6_addrpolicy defaultaddrpolicy;
@@ -603,11 +587,7 @@
/* If the caller specify the outgoing interface explicitly, use it. */
if (opts && (pi = opts->ip6po_pktinfo) != NULL && pi->ipi6_ifindex) {
/* XXX boundary check is assumed to be already done. */
-#ifdef __FreeBSD__
- ifp = ifnet_byindex(pi->ipi6_ifindex);
-#else
ifp = ifindex2ifnet[pi->ipi6_ifindex];
-#endif
if (ifp != NULL &&
(norouteok || retrt == NULL ||
IN6_IS_ADDR_MULTICAST(dst))) {
