g/c DIOCCLRRULECTRS

kinda deprecated for a decade now, nothing in base uses it, nothing in
ports uses it (thanks sthen)
ok phessler sashan

diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 7cb7b92..9c6b02e 100644 (file)
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pf_ioctl.c,v 1.312 2017/05/15 12:26:00 mpi Exp $ */
+/*     $OpenBSD: pf_ioctl.c,v 1.313 2017/05/30 19:37:54 henning Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -915,7 +915,6 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                case DIOCSETDEBUG:
                case DIOCGETSTATES:
                case DIOCGETTIMEOUT:
-               case DIOCCLRRULECTRS:
                case DIOCGETLIMIT:
                case DIOCGETRULESETS:
                case DIOCGETRULESET:
@@ -1795,20 +1794,6 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
                break;
        }
 
-       case DIOCCLRRULECTRS: {
-               /* obsoleted by DIOCGETRULE with action=PF_GET_CLR_CNTR */
-               struct pf_ruleset       *ruleset = &pf_main_ruleset;
-               struct pf_rule          *rule;
-
-               TAILQ_FOREACH(rule,
-                   ruleset->rules.active.ptr, entries) {
-                       rule->evaluations = 0;
-                       rule->packets[0] = rule->packets[1] = 0;
-                       rule->bytes[0] = rule->bytes[1] = 0;
-               }
-               break;
-       }
-
        case DIOCGETRULESETS: {
                struct pfioc_ruleset    *pr = (struct pfioc_ruleset *)addr;
                struct pf_ruleset       *ruleset;

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index a8ba6f1..da2eb79 100644 (file)
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pfvar.h,v 1.455 2017/05/30 08:10:01 henning Exp $ */
+/*     $OpenBSD: pfvar.h,v 1.456 2017/05/30 19:37:54 henning Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1559,7 +1559,7 @@ struct pfioc_iface {
 #define DIOCSETTIMEOUT _IOWR('D', 29, struct pfioc_tm)
 #define DIOCGETTIMEOUT _IOWR('D', 30, struct pfioc_tm)
 #define DIOCADDSTATE   _IOWR('D', 37, struct pfioc_state)
-#define DIOCCLRRULECTRS        _IO  ('D', 38)
+/* XXX cut 38 */
 #define DIOCGETLIMIT   _IOWR('D', 39, struct pfioc_limit)
 #define DIOCSETLIMIT   _IOWR('D', 40, struct pfioc_limit)
 #define DIOCKILLSTATES _IOWR('D', 41, struct pfioc_state_kill)