diff options
author | dim <dim@FreeBSD.org> | 2010-11-22 19:32:54 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2010-11-22 19:32:54 +0000 |
commit | fb307d7d1de2e083e767df27714dca5352792ac3 (patch) | |
tree | ddc86814ee8f35466e619bb63b8f15b41185074e /sys/netipsec | |
parent | b040c9742c99e20eb9926995bea03ad4f3e849c8 (diff) | |
download | FreeBSD-src-fb307d7d1de2e083e767df27714dca5352792ac3.zip FreeBSD-src-fb307d7d1de2e083e767df27714dca5352792ac3.tar.gz |
After some off-list discussion, revert a number of changes to the
DPCPU_DEFINE and VNET_DEFINE macros, as these cause problems for various
people working on the affected files. A better long-term solution is
still being considered. This reversal may give some modules empty
set_pcpu or set_vnet sections, but these are harmless.
Changes reverted:
------------------------------------------------------------------------
r215318 | dim | 2010-11-14 21:40:55 +0100 (Sun, 14 Nov 2010) | 4 lines
Instead of unconditionally emitting .globl's for the __start_set_xxx and
__stop_set_xxx symbols, only emit them when the set_vnet or set_pcpu
sections are actually defined.
------------------------------------------------------------------------
r215317 | dim | 2010-11-14 21:38:11 +0100 (Sun, 14 Nov 2010) | 3 lines
Apply the STATIC_VNET_DEFINE and STATIC_DPCPU_DEFINE macros throughout
the tree.
------------------------------------------------------------------------
r215316 | dim | 2010-11-14 21:23:02 +0100 (Sun, 14 Nov 2010) | 2 lines
Add macros to define static instances of VNET_DEFINE and DPCPU_DEFINE.
Diffstat (limited to 'sys/netipsec')
-rw-r--r-- | sys/netipsec/key.c | 36 | ||||
-rw-r--r-- | sys/netipsec/keysock.c | 2 | ||||
-rw-r--r-- | sys/netipsec/xform_esp.c | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 869ad74..e57eb44 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -113,20 +113,20 @@ */ VNET_DEFINE(u_int32_t, key_debug_level) = 0; -STATIC_VNET_DEFINE(u_int, key_spi_trycnt) = 1000; -STATIC_VNET_DEFINE(u_int32_t, key_spi_minval) = 0x100; -STATIC_VNET_DEFINE(u_int32_t, key_spi_maxval) = 0x0fffffff; /* XXX */ -STATIC_VNET_DEFINE(u_int32_t, policy_id) = 0; +static VNET_DEFINE(u_int, key_spi_trycnt) = 1000; +static VNET_DEFINE(u_int32_t, key_spi_minval) = 0x100; +static VNET_DEFINE(u_int32_t, key_spi_maxval) = 0x0fffffff; /* XXX */ +static VNET_DEFINE(u_int32_t, policy_id) = 0; /*interval to initialize randseed,1(m)*/ -STATIC_VNET_DEFINE(u_int, key_int_random) = 60; +static VNET_DEFINE(u_int, key_int_random) = 60; /* interval to expire acquiring, 30(s)*/ -STATIC_VNET_DEFINE(u_int, key_larval_lifetime) = 30; +static VNET_DEFINE(u_int, key_larval_lifetime) = 30; /* counter for blocking SADB_ACQUIRE.*/ -STATIC_VNET_DEFINE(int, key_blockacq_count) = 10; +static VNET_DEFINE(int, key_blockacq_count) = 10; /* lifetime for blocking SADB_ACQUIRE.*/ -STATIC_VNET_DEFINE(int, key_blockacq_lifetime) = 20; +static VNET_DEFINE(int, key_blockacq_lifetime) = 20; /* preferred old sa rather than new sa.*/ -STATIC_VNET_DEFINE(int, key_preferred_oldsa) = 1; +static VNET_DEFINE(int, key_preferred_oldsa) = 1; #define V_key_spi_trycnt VNET(key_spi_trycnt) #define V_key_spi_minval VNET(key_spi_minval) #define V_key_spi_maxval VNET(key_spi_maxval) @@ -137,11 +137,11 @@ STATIC_VNET_DEFINE(int, key_preferred_oldsa) = 1; #define V_key_blockacq_lifetime VNET(key_blockacq_lifetime) #define V_key_preferred_oldsa VNET(key_preferred_oldsa) -STATIC_VNET_DEFINE(u_int32_t, acq_seq) = 0; +static VNET_DEFINE(u_int32_t, acq_seq) = 0; #define V_acq_seq VNET(acq_seq) /* SPD */ -STATIC_VNET_DEFINE(LIST_HEAD(_sptree, secpolicy), sptree[IPSEC_DIR_MAX]); +static VNET_DEFINE(LIST_HEAD(_sptree, secpolicy), sptree[IPSEC_DIR_MAX]); #define V_sptree VNET(sptree) static struct mtx sptree_lock; #define SPTREE_LOCK_INIT() \ @@ -152,7 +152,7 @@ static struct mtx sptree_lock; #define SPTREE_UNLOCK() mtx_unlock(&sptree_lock) #define SPTREE_LOCK_ASSERT() mtx_assert(&sptree_lock, MA_OWNED) -STATIC_VNET_DEFINE(LIST_HEAD(_sahtree, secashead), sahtree); /* SAD */ +static VNET_DEFINE(LIST_HEAD(_sahtree, secashead), sahtree); /* SAD */ #define V_sahtree VNET(sahtree) static struct mtx sahtree_lock; #define SAHTREE_LOCK_INIT() \ @@ -164,7 +164,7 @@ static struct mtx sahtree_lock; #define SAHTREE_LOCK_ASSERT() mtx_assert(&sahtree_lock, MA_OWNED) /* registed list */ -STATIC_VNET_DEFINE(LIST_HEAD(_regtree, secreg), regtree[SADB_SATYPE_MAX + 1]); +static VNET_DEFINE(LIST_HEAD(_regtree, secreg), regtree[SADB_SATYPE_MAX + 1]); #define V_regtree VNET(regtree) static struct mtx regtree_lock; #define REGTREE_LOCK_INIT() \ @@ -174,7 +174,7 @@ static struct mtx regtree_lock; #define REGTREE_UNLOCK() mtx_unlock(®tree_lock) #define REGTREE_LOCK_ASSERT() mtx_assert(®tree_lock, MA_OWNED) -STATIC_VNET_DEFINE(LIST_HEAD(_acqtree, secacq), acqtree); /* acquiring list */ +static VNET_DEFINE(LIST_HEAD(_acqtree, secacq), acqtree); /* acquiring list */ #define V_acqtree VNET(acqtree) static struct mtx acq_lock; #define ACQ_LOCK_INIT() \ @@ -185,7 +185,7 @@ static struct mtx acq_lock; #define ACQ_LOCK_ASSERT() mtx_assert(&acq_lock, MA_OWNED) /* SP acquiring list */ -STATIC_VNET_DEFINE(LIST_HEAD(_spacqtree, secspacq), spacqtree); +static VNET_DEFINE(LIST_HEAD(_spacqtree, secspacq), spacqtree); #define V_spacqtree VNET(spacqtree) static struct mtx spacq_lock; #define SPACQ_LOCK_INIT() \ @@ -269,9 +269,9 @@ static const int maxsize[] = { sizeof(struct sadb_x_nat_t_frag),/* SADB_X_EXT_NAT_T_FRAG */ }; -STATIC_VNET_DEFINE(int, ipsec_esp_keymin) = 256; -STATIC_VNET_DEFINE(int, ipsec_esp_auth) = 0; -STATIC_VNET_DEFINE(int, ipsec_ah_keymin) = 128; +static VNET_DEFINE(int, ipsec_esp_keymin) = 256; +static VNET_DEFINE(int, ipsec_esp_auth) = 0; +static VNET_DEFINE(int, ipsec_ah_keymin) = 128; #define V_ipsec_esp_keymin VNET(ipsec_esp_keymin) #define V_ipsec_esp_auth VNET(ipsec_esp_auth) diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 2fb1c1f..143b600 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -70,7 +70,7 @@ struct key_cb { int key_count; int any_count; }; -STATIC_VNET_DEFINE(struct key_cb, key_cb); +static VNET_DEFINE(struct key_cb, key_cb); #define V_key_cb VNET(key_cb) static struct sockaddr key_src = { 2, PF_KEY, }; diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c index 2ccdb10..6186b59 100644 --- a/sys/netipsec/xform_esp.c +++ b/sys/netipsec/xform_esp.c @@ -85,7 +85,7 @@ SYSCTL_VNET_INT(_net_inet_esp, OID_AUTO, SYSCTL_VNET_STRUCT(_net_inet_esp, IPSECCTL_STATS, stats, CTLFLAG_RD, &VNET_NAME(espstat), espstat, ""); -STATIC_VNET_DEFINE(int, esp_max_ivlen); /* max iv length over all algorithms */ +static VNET_DEFINE(int, esp_max_ivlen); /* max iv length over all algorithms */ #define V_esp_max_ivlen VNET(esp_max_ivlen) static int esp_input_cb(struct cryptop *op); |