CVS commit: src/sys

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Mon Aug 31 16:46:14 UTC 2015

Modified Files:
        src/sys/kern: init_main.c
        src/sys/netinet: in.c

Log Message:
Fix building kernels w/o ether


To generate a diff of this commit:
cvs rdiff -u -r1.468 -r1.469 src/sys/kern/init_main.c
cvs rdiff -u -r1.160 -r1.161 src/sys/netinet/in.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/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.468 src/sys/kern/init_main.c:1.469
--- src/sys/kern/init_main.c:1.468	Mon Aug 31 08:02:44 2015
+++ src/sys/kern/init_main.c	Mon Aug 31 16:46:14 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_main.c,v 1.468 2015/08/31 08:02:44 ozaki-r Exp $	*/
+/*	$NetBSD: init_main.c,v 1.469 2015/08/31 16:46:14 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.468 2015/08/31 08:02:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.469 2015/08/31 16:46:14 ozaki-r Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ipsec.h"
@@ -121,6 +121,7 @@ extern void *_binary_splash_image_end;
 #endif
 
 #include "drvctl.h"
+#include "ether.h"
 #include "ksyms.h"
 
 #include "veriexec.h"
@@ -566,7 +567,9 @@ main(void)
 	 */
 	s = splnet();
 	ifinit();
+#if NETHER > 0
 	lltableinit();
+#endif
 	domaininit(true);
 	if_attachdomain();
 	splx(s);

Index: src/sys/netinet/in.c
diff -u src/sys/netinet/in.c:1.160 src/sys/netinet/in.c:1.161
--- src/sys/netinet/in.c:1.160	Mon Aug 31 09:21:55 2015
+++ src/sys/netinet/in.c	Mon Aug 31 16:46:14 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: in.c,v 1.160 2015/08/31 09:21:55 ozaki-r Exp $	*/
+/*	$NetBSD: in.c,v 1.161 2015/08/31 16:46:14 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,9 +91,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.160 2015/08/31 09:21:55 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.161 2015/08/31 16:46:14 ozaki-r Exp $");
 
 #include "arp.h"
+#include "ether.h"
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1535,6 +1536,8 @@ in_selectsrc(struct sockaddr_in *sin, st
 	return satosin(&ia->ia_addr);
 }
 
+#if NETHER > 0
+
 struct in_llentry {
 	struct llentry		base;
 };
@@ -1852,6 +1855,8 @@ in_lltable_lookup(struct lltable *llt, u
 	return lle;
 }
 
+#endif /* NETHER > 0 */
+
 static void
 in_sysctl_init(struct sysctllog **clog)
 {
@@ -1885,6 +1890,7 @@ in_sysctl_init(struct sysctllog **clog)
 		       IPCTL_HOSTZEROBROADCAST, CTL_EOL);
 }
 
+#if NETHER > 0
 static struct lltable *
 in_lltattach(struct ifnet *ifp)
 {
@@ -1908,6 +1914,7 @@ in_lltattach(struct ifnet *ifp)
 
 	return (llt);
 }
+#endif /* NETHER > 0 */
 
 void *
 in_domifattach(struct ifnet *ifp)
@@ -1917,7 +1924,9 @@ in_domifattach(struct ifnet *ifp)
 	ii = kmem_zalloc(sizeof(struct in_ifinfo), KM_SLEEP);
 	KASSERT(ii != NULL);
 
+#if NETHER > 0
 	ii->ii_llt = in_lltattach(ifp);
+#endif
 
 #ifdef IPSELSRC
 	ii->ii_selsrc = in_selsrc_domifattach(ifp);
@@ -1935,6 +1944,8 @@ in_domifdetach(struct ifnet *ifp, void *
 #ifdef IPSELSRC
 	in_selsrc_domifdetach(ifp, ii->ii_selsrc);
 #endif
+#if NETHER > 0
 	lltable_free(ii->ii_llt);
+#endif
 	kmem_free(ii, sizeof(struct in_ifinfo));
 }