Module Name: src
Committed By: maxv
Date: Wed Feb 28 11:19:49 UTC 2018
Modified Files:
src/sys/netipsec: ipsec_private.h
Log Message:
Remove unused macros, and while here style.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/netipsec/ipsec_private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/ipsec_private.h
diff -u src/sys/netipsec/ipsec_private.h:1.6 src/sys/netipsec/ipsec_private.h:1.7
--- src/sys/netipsec/ipsec_private.h:1.6 Wed Feb 28 11:09:03 2018
+++ src/sys/netipsec/ipsec_private.h Wed Feb 28 11:19:49 2018
@@ -1,6 +1,6 @@
-/* $NetBSD: ipsec_private.h,v 1.6 2018/02/28 11:09:03 maxv Exp $ */
+/* $NetBSD: ipsec_private.h,v 1.7 2018/02/28 11:19:49 maxv Exp $ */
-/*-
+/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -35,21 +35,18 @@
#ifdef _KERNEL
#include <net/net_stats.h>
-extern percpu_t *ipsecstat_percpu;
-extern percpu_t *ahstat_percpu;
-extern percpu_t *espstat_percpu;
-extern percpu_t *ipcompstat_percpu;
-extern percpu_t *ipipstat_percpu;
-extern percpu_t *pfkeystat_percpu;
+extern percpu_t *ipsecstat_percpu;
+extern percpu_t *ahstat_percpu;
+extern percpu_t *espstat_percpu;
+extern percpu_t *ipcompstat_percpu;
+extern percpu_t *ipipstat_percpu;
+extern percpu_t *pfkeystat_percpu;
#define IPSEC_STAT_GETREF() _NET_STAT_GETREF(ipsecstat_percpu)
#define IPSEC_STAT_PUTREF() _NET_STAT_PUTREF(ipsecstat_percpu)
#define IPSEC_STATINC(x) _NET_STATINC(ipsecstat_percpu, x)
#define IPSEC_STATADD(x, v) _NET_STATADD(ipsecstat_percpu, x, v)
-#define IPSEC6_STAT_GETREF() IPSEC_STAT_GETREF()
-#define IPSEC6_STAT_PUTREF() IPSEC_STAT_PUTREF()
-
#define AH_STATINC(x) _NET_STATINC(ahstat_percpu, x)
#define AH_STATADD(x, v) _NET_STATADD(ahstat_percpu, x, v)
@@ -90,14 +87,16 @@ extern percpu_t *pfkeystat_percpu;
#include <sys/socketvar.h> /* for softnet_lock */
#define IPSEC_DECLARE_LOCK_VARIABLE int __s
-#define IPSEC_ACQUIRE_GLOBAL_LOCKS() do { \
- __s = splsoftnet(); \
- mutex_enter(softnet_lock); \
- } while (0)
-#define IPSEC_RELEASE_GLOBAL_LOCKS() do { \
- mutex_exit(softnet_lock); \
- splx(__s); \
- } while (0)
+#define IPSEC_ACQUIRE_GLOBAL_LOCKS() \
+ do { \
+ __s = splsoftnet(); \
+ mutex_enter(softnet_lock); \
+ } while (0)
+#define IPSEC_RELEASE_GLOBAL_LOCKS() \
+ do { \
+ mutex_exit(softnet_lock); \
+ splx(__s); \
+ } while (0)
#endif
#endif /* _KERNEL */
