PERFORCE change 150231 for review
Bjoern A. Zeeb
bz at FreeBSD.org
Sun Sep 21 20:25:17 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=150231
Change 150231 by bz at bz_dumpster on 2008/09/21 20:25:13
More whitespace/style changes.
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#7 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#11 (text+ko) ====
@@ -330,10 +330,10 @@
static void
in6_rtqtimo(void *rock)
{
- struct radix_node_head *rnh = rock;
CURVNET_SET_QUIET((struct vnet *) rock);
INIT_VNET_NET((struct vnet *) rock);
INIT_VNET_INET6((struct vnet *) rock);
+ struct radix_node_head *rnh = rock;
struct rtqk_arg arg;
struct timeval atv;
static time_t last_adjusted_timeout = 0;
@@ -416,10 +416,10 @@
static void
in6_mtutimo(void *rock)
{
- struct radix_node_head *rnh = rock;
CURVNET_SET_QUIET((struct vnet *) rock);
INIT_VNET_NET((struct vnet *) rock);
INIT_VNET_INET6((struct vnet *) rock);
+ struct radix_node_head *rnh = rock;
struct mtuex_arg arg;
struct timeval atv;
==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#10 (text+ko) ====
@@ -1220,9 +1220,9 @@
static void
nd6_dad_timer(struct ifaddr *ifa)
{
- int s;
CURVNET_SET(dp->dad_vnet);
INIT_VNET_INET6(curvnet);
+ int s;
struct in6_ifaddr *ia = (struct in6_ifaddr *)ifa;
struct dadq *dp;
char ip6buf[INET6_ADDRSTRLEN];
==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#10 (text+ko) ====
@@ -2037,7 +2037,6 @@
void
rt6_flush(struct in6_addr *gateway, struct ifnet *ifp)
{
-
INIT_VNET_NET(curvnet);
struct radix_node_head *rnh = V_rt_tables[0][AF_INET6];
int s = splnet();
==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#8 (text+ko) ====
@@ -206,9 +206,9 @@
int *error
)
{
- INIT_VNET_IPSEC(curvnet);
#define IPSEC_OSTAT(x,y,z) (isr->saidx.proto == IPPROTO_ESP ? (x)++ : \
isr->saidx.proto == IPPROTO_AH ? (y)++ : (z)++)
+ INIT_VNET_IPSEC(curvnet);
struct secasvar *sav;
IPSECREQUEST_LOCK_ASSERT(isr);
==== //depot/projects/vimage-commit2/src/sys/netipsec/key.c#12 (text+ko) ====
@@ -270,6 +270,7 @@
/* counter for blocking to send SADB_ACQUIRE to IKEd */
SYSCTL_V_INT(V_NET, vnet_ipsec, _net_key, KEYCTL_BLOCKACQ_COUNT,
blockacq_count, CTLFLAG_RW, key_blockacq_count, 0, "");
+
/* lifetime for blocking to send SADB_ACQUIRE to IKEd */
SYSCTL_V_INT(V_NET, vnet_ipsec, _net_key, KEYCTL_BLOCKACQ_LIFETIME,
blockacq_lifetime, CTLFLAG_RW, key_blockacq_lifetime, 0, "");
@@ -555,6 +556,7 @@
key_havesp(u_int dir)
{
INIT_VNET_IPSEC(curvnet);
+
return (dir == IPSEC_DIR_INBOUND || dir == IPSEC_DIR_OUTBOUND ?
LIST_FIRST(&V_sptree[dir]) != NULL : 1);
}
@@ -858,8 +860,8 @@
static struct secasvar *
key_allocsa_policy(const struct secasindex *saidx)
{
+#define N(a) _ARRAYLEN(a)
INIT_VNET_IPSEC(curvnet);
-#define N(a) _ARRAYLEN(a)
struct secashead *sah;
struct secasvar *sav;
u_int stateidx, arraysize;
@@ -5558,6 +5560,7 @@
u_int16_t* max)
{
INIT_VNET_IPSEC(curvnet);
+
*min = *max = ah->keysize;
if (ah->keysize == 0) {
/*
==== //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#9 (text+ko) ====
@@ -84,6 +84,7 @@
esp_enable, CTLFLAG_RW, esp_enable, 0, "");
SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_esp, IPSECCTL_STATS,
stats, CTLFLAG_RD, espstat, espstat, "");
+
static int esp_max_ivlen; /* max iv length over all algorithms */
static int esp_input_cb(struct cryptop *op);
==== //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#7 (text+ko) ====
@@ -226,16 +226,16 @@
DATA_SET(sysctl_set, sysctl__##parent##_##name)
#ifdef VIMAGE
-#define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \
- handler, fmt, descr) \
- static struct sysctl_oid sysctl__##parent##_##name = { \
- &sysctl_##parent##_children, { 0 }, nbr, kind, \
- (void *) offsetof(struct mod, _##a1), a2, #name, \
- handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \
+#define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \
+ handler, fmt, descr) \
+ static struct sysctl_oid sysctl__##parent##_##name = { \
+ &sysctl_##parent##_children, { 0 }, nbr, kind, \
+ (void *) offsetof(struct mod, _##a1), a2, #name, \
+ handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \
DATA_SET(sysctl_set, sysctl__##parent##_##name)
#else
-#define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \
- handler, fmt, descr) \
+#define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \
+ handler, fmt, descr) \
SYSCTL_OID(parent, nbr, name, kind, &a1, a2, handler, fmt, descr)
#endif
@@ -258,11 +258,11 @@
arg, len, sysctl_handle_string, "A", descr)
#ifdef VIMAGE
-#define SYSCTL_V_STRING(subs, mod, parent, nbr, name, access, sym, len, descr) \
+#define SYSCTL_V_STRING(subs, mod, parent, nbr, name, access, sym, len, descr) \
SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_STRING|(access), \
sym, len, sysctl_handle_v_string, "A", descr)
#else
-#define SYSCTL_V_STRING(subs, mod, parent, nbr, name, access, sym, len, descr) \
+#define SYSCTL_V_STRING(subs, mod, parent, nbr, name, access, sym, len, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_STRING|(access), \
&sym, len, sysctl_handle_string, "A", descr)
#endif
@@ -277,11 +277,11 @@
ptr, val, sysctl_handle_int, "I", descr)
#ifdef VIMAGE
-#define SYSCTL_V_INT(subs, mod, parent, nbr, name, access, sym, val, descr) \
+#define SYSCTL_V_INT(subs, mod, parent, nbr, name, access, sym, val, descr) \
SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_INT|(access), \
sym, val, sysctl_handle_v_int, "I", descr)
#else
-#define SYSCTL_V_INT(subs, mod, parent, nbr, name, access, sym, val, descr) \
+#define SYSCTL_V_INT(subs, mod, parent, nbr, name, access, sym, val, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|(access), \
&sym, val, sysctl_handle_int, "I", descr)
#endif
@@ -296,11 +296,11 @@
ptr, val, sysctl_handle_int, "IU", descr)
#ifdef VIMAGE
-#define SYSCTL_V_UINT(subs, mod, parent, nbr, name, access, sym, val, descr) \
+#define SYSCTL_V_UINT(subs, mod, parent, nbr, name, access, sym, val, descr) \
SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_INT|(access), \
sym, val, sysctl_handle_v_int, "IU", descr)
#else
-#define SYSCTL_V_UINT(subs, mod, parent, nbr, name, access, sym, val, descr) \
+#define SYSCTL_V_UINT(subs, mod, parent, nbr, name, access, sym, val, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|(access), \
&sym, val, sysctl_handle_int, "IU", descr)
#endif
@@ -368,14 +368,14 @@
"S," #type, descr)
#ifdef VIMAGE
-#define SYSCTL_V_STRUCT(subs, mod, parent, nbr, name, access, sym, \
- type, descr) \
+#define SYSCTL_V_STRUCT(subs, mod, parent, nbr, name, access, sym, \
+ type, descr) \
SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_OPAQUE|(access), \
sym, sizeof(struct type), sysctl_handle_v_opaque, \
"S," #type, descr)
#else
-#define SYSCTL_V_STRUCT(subs, mod, parent, nbr, name, access, sym, \
- type, descr) \
+#define SYSCTL_V_STRUCT(subs, mod, parent, nbr, name, access, sym, \
+ type, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_OPAQUE|(access), \
&sym, sizeof(struct type), sysctl_handle_opaque, \
"S," #type, descr)
@@ -410,7 +410,7 @@
* Resolve void *arg1 in a proper virtualization container.
*/
#ifdef VIMAGE
-#define SYSCTL_RESOLVE_V_ARG1() do { \
+#define SYSCTL_RESOLVE_V_ARG1() do { \
char *cp; \
switch (oidp->oid_v_subs) { \
case V_NET: \
More information about the p4-projects
mailing list