Module Name: src
Committed By: jakllsch
Date: Fri Nov 4 02:57:28 UTC 2011
Modified Files:
src/sys/net/npf: npf_ctl.c
Log Message:
Use uint8_t instead of npf_netmask_t, as npf_netmask_t is a uint_fast8_t,
which is in many places is actually a uint32_t and thus incompatible with
prop_dictionary_get_uint8(). The correct type is noted in a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/net/npf/npf_ctl.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_ctl.c
diff -u src/sys/net/npf/npf_ctl.c:1.7 src/sys/net/npf/npf_ctl.c:1.8
--- src/sys/net/npf/npf_ctl.c:1.7 Fri Nov 4 01:00:27 2011
+++ src/sys/net/npf/npf_ctl.c Fri Nov 4 02:57:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ctl.c,v 1.7 2011/11/04 01:00:27 zoltan Exp $ */
+/* $NetBSD: npf_ctl.c,v 1.8 2011/11/04 02:57:28 jakllsch Exp $ */
/*-
* Copyright (c) 2009-2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.7 2011/11/04 01:00:27 zoltan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.8 2011/11/04 02:57:28 jakllsch Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -121,7 +121,7 @@ npf_mk_tables(npf_tableset_t *tblset, pr
eit = prop_array_iterator(entries);
while ((ent = prop_object_iterator_next(eit)) != NULL) {
const npf_addr_t *addr;
- npf_netmask_t mask;
+ uint8_t mask; /* XXX should be npf_netmask_t */
/* Get address and mask. Add a table entry. */
addr = (const npf_addr_t *)prop_data_data_nocopy(prop_dictionary_get(ent, "addr"));
