Module Name: src
Committed By: christos
Date: Mon Mar 11 16:37:44 UTC 2013
Modified Files:
src/sys/net/npf: npf.h npf_ext_log.c npf_ext_normalise.c
npf_ext_rndblock.c
Log Message:
- avoid trailing , in dependencies when there are none other the npf module
itself.
- remove if_npflog dependency from npf_ext_log.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/net/npf/npf.h
cvs rdiff -u -r1.4 -r1.5 src/sys/net/npf/npf_ext_log.c
cvs rdiff -u -r1.2 -r1.3 src/sys/net/npf/npf_ext_normalise.c
cvs rdiff -u -r1.1 -r1.2 src/sys/net/npf/npf_ext_rndblock.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/net/npf/npf.h
diff -u src/sys/net/npf/npf.h:1.27 src/sys/net/npf/npf.h:1.28
--- src/sys/net/npf/npf.h:1.27 Sun Feb 10 18:47:37 2013
+++ src/sys/net/npf/npf.h Mon Mar 11 12:37:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.h,v 1.27 2013/02/10 23:47:37 rmind Exp $ */
+/* $NetBSD: npf.h,v 1.28 2013/03/11 16:37:43 christos Exp $ */
/*-
* Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@ typedef uint8_t npf_netmask_t;
#define NPF_DECISION_PASS 1
#define NPF_EXT_MODULE(name, req) \
- MODULE(MODULE_CLASS_MISC, name, "npf," req)
+ MODULE(MODULE_CLASS_MISC, name, req ? ("npf," req) : "npf")
/*
* Packet information cache.
Index: src/sys/net/npf/npf_ext_log.c
diff -u src/sys/net/npf/npf_ext_log.c:1.4 src/sys/net/npf/npf_ext_log.c:1.5
--- src/sys/net/npf/npf_ext_log.c:1.4 Sun Mar 10 21:42:12 2013
+++ src/sys/net/npf/npf_ext_log.c Mon Mar 11 12:37:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ext_log.c,v 1.4 2013/03/11 01:42:12 christos Exp $ */
+/* $NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $ */
/*-
* Copyright (c) 2010-2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.4 2013/03/11 01:42:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: npf_ext_log.
#include "npf_impl.h"
-NPF_EXT_MODULE(npf_ext_log, "if_npflog");
+NPF_EXT_MODULE(npf_ext_log, NULL);
#define NPFEXT_LOG_VER 1
Index: src/sys/net/npf/npf_ext_normalise.c
diff -u src/sys/net/npf/npf_ext_normalise.c:1.2 src/sys/net/npf/npf_ext_normalise.c:1.3
--- src/sys/net/npf/npf_ext_normalise.c:1.2 Mon Dec 24 14:05:42 2012
+++ src/sys/net/npf/npf_ext_normalise.c Mon Mar 11 12:37:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ext_normalise.c,v 1.2 2012/12/24 19:05:42 rmind Exp $ */
+/* $NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_normalise.c,v 1.2 2012/12/24 19:05:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: npf_ext_norm
/*
* NPF extension module definition and the identifier.
*/
-NPF_EXT_MODULE(npf_ext_normalise, "");
+NPF_EXT_MODULE(npf_ext_normalise, NULL);
#define NPFEXT_NORMALISE_VER 1
Index: src/sys/net/npf/npf_ext_rndblock.c
diff -u src/sys/net/npf/npf_ext_rndblock.c:1.1 src/sys/net/npf/npf_ext_rndblock.c:1.2
--- src/sys/net/npf/npf_ext_rndblock.c:1.1 Sun Dec 9 19:32:23 2012
+++ src/sys/net/npf/npf_ext_rndblock.c Mon Mar 11 12:37:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ext_rndblock.c,v 1.1 2012/12/10 00:32:23 rmind Exp $ */
+/* $NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_rndblock.c,v 1.1 2012/12/10 00:32:23 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $");
#include <sys/types.h>
#include <sys/cprng.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: npf_ext_rndb
/*
* NPF extension module definition and the identifier.
*/
-NPF_EXT_MODULE(npf_ext_rndblock, "");
+NPF_EXT_MODULE(npf_ext_rndblock, NULL);
#define NPFEXT_RNDBLOCK_VER 1
