Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/npf/npfctl load the config file before bpfjit so th...



details:   https://anonhg.NetBSD.org/src/rev/9e8046836958
branches:  trunk
changeset: 805514:9e8046836958
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 04 20:02:15 2015 +0000

description:
load the config file before bpfjit so that we can disable the warning.

diffstat:

 usr.sbin/npf/npfctl/npfctl.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 5b4bf13e0750 -r 9e8046836958 usr.sbin/npf/npfctl/npfctl.c
--- a/usr.sbin/npf/npfctl/npfctl.c      Sun Jan 04 19:31:00 2015 +0000
+++ b/usr.sbin/npf/npfctl/npfctl.c      Sun Jan 04 20:02:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npfctl.c,v 1.45 2014/12/26 22:44:54 christos Exp $     */
+/*     $NetBSD: npfctl.c,v 1.46 2015/01/04 20:02:15 christos Exp $     */
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: npfctl.c,v 1.45 2014/12/26 22:44:54 christos Exp $");
+__RCSID("$NetBSD: npfctl.c,v 1.46 2015/01/04 20:02:15 christos Exp $");
 
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -580,9 +580,9 @@
                fun = "ioctl(IOC_NPF_SWITCH)";
                break;
        case NPFCTL_RELOAD:
-               npfctl_preload_bpfjit();
                npfctl_config_init(false);
                npfctl_parse_file(argc < 3 ? NPF_CONF_PATH : argv[2]);
+               npfctl_preload_bpfjit();
                errno = ret = npfctl_config_send(fd, NULL);
                fun = "npfctl_config_send";
                break;



Home | Main Index | Thread Index | Old Index