Module Name: src
Committed By: knakahara
Date: Tue Jan 16 07:34:12 UTC 2018
Modified Files:
src/sys/modules/if_agr: Makefile
src/sys/net/agr: if_agr.c
Log Message:
Fix agr(4) module build. Reviewed by [email protected], thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/if_agr/Makefile
cvs rdiff -u -r1.44 -r1.45 src/sys/net/agr/if_agr.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/modules/if_agr/Makefile
diff -u src/sys/modules/if_agr/Makefile:1.1 src/sys/modules/if_agr/Makefile:1.2
--- src/sys/modules/if_agr/Makefile:1.1 Sun Aug 7 14:27:38 2016
+++ src/sys/modules/if_agr/Makefile Tue Jan 16 07:34:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/07 14:27:38 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/16 07:34:12 knakahara Exp $
.include "../Makefile.inc"
@@ -25,6 +25,6 @@ if_agrsoftc.c \
if_agrsubr.c \
if_agrtimer.c
-CPPFLAGS+= -DINET
+CPPFLAGS+= -DINET -DNVLAN=1
.include <bsd.kmodule.mk>
Index: src/sys/net/agr/if_agr.c
diff -u src/sys/net/agr/if_agr.c:1.44 src/sys/net/agr/if_agr.c:1.45
--- src/sys/net/agr/if_agr.c:1.44 Mon Jan 15 11:16:04 2018
+++ src/sys/net/agr/if_agr.c Tue Jan 16 07:34:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_agr.c,v 1.44 2018/01/15 11:16:04 maxv Exp $ */
+/* $NetBSD: if_agr.c,v 1.45 2018/01/16 07:34:12 knakahara Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,13 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.44 2018/01/15 11:16:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.45 2018/01/16 07:34:12 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
-#endif
-
#include "vlan.h"
+#endif
#include <sys/param.h>
#include <sys/callout.h>
@@ -1168,4 +1167,4 @@ agrport_config_promisc(struct agr_port *
*/
#include <net/if_module.h>
-IF_MODULE(MODULE_CLASS_DRIVER, agr, "")
+IF_MODULE(MODULE_CLASS_DRIVER, agr, "if_vlan")
