Module Name:    src
Committed By:   christos
Date:           Wed Oct 28 01:54:10 UTC 2015

Modified Files:
        src/sys/net/npf: npf_ctl.c

Log Message:
remove bogus KASSERT, there are error paths that don't satisfy this.
XXX: should improve error reporting to userland.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 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.42 src/sys/net/npf/npf_ctl.c:1.43
--- src/sys/net/npf/npf_ctl.c:1.42	Sun Jun  7 21:00:43 2015
+++ src/sys/net/npf/npf_ctl.c	Tue Oct 27 21:54:10 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_ctl.c,v 1.42 2015/06/08 01:00:43 rmind Exp $	*/
+/*	$NetBSD: npf_ctl.c,v 1.43 2015/10/28 01:54:10 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.42 2015/06/08 01:00:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.43 2015/10/28 01:54:10 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -609,7 +609,6 @@ fail:
 	/*
 	 * Note: destroy rulesets first, to drop references to the tableset.
 	 */
-	KASSERT(error == 0 || (nset || rpset || rlset || tblset));
 	if (nset) {
 		npf_ruleset_destroy(nset);
 	}

Reply via email to