PERFORCE change 126627 for review
Ana Kukec
anchie at FreeBSD.org
Thu Sep 20 14:22:31 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=126627
Change 126627 by anchie at anchie_malimis on 2007/09/20 16:16:36
Added declaration of ip6_gif_hlim variable used in generic
kernel.
Added macro which supstitutes SYSCTL_V_OID with SYSCTL_OID
in case of generic kernel.
Affected files ...
.. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#21 edit
.. //depot/projects/vimage/src/sys/sys/sysctl.h#9 edit
Differences ...
==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#21 (text+ko) ====
@@ -376,6 +376,7 @@
int ip6_hdrnestlimit; /* How many header options will we process? */
int ip6_dad_count; /* DupAddrDetectionTransmits */
int ip6_auto_flowlabel;
+int ip6_gif_hlim = 0;
int ip6_use_deprecated; /* allow deprecated addr (RFC2462 5.5.4) */
int ip6_rr_prune; /* router renumbering prefix
* walk list every 5 sec. */
@@ -527,21 +528,12 @@
rr_prune, CTLFLAG_RW, ip6_rr_prune, 0, "");
SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_USETEMPADDR,
use_tempaddr, CTLFLAG_RW, ip6_use_tempaddr, 0, "");
-#ifdef VIMAGE
SYSCTL_V_OID(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_TEMPPLTIME, temppltime,
CTLTYPE_INT|CTLFLAG_RW, ip6_temp_preferred_lifetime, 0,
sysctl_ip6_temppltime, "I", "");
SYSCTL_V_OID(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_TEMPVLTIME, tempvltime,
CTLTYPE_INT|CTLFLAG_RW, ip6_temp_valid_lifetime, 0,
sysctl_ip6_tempvltime, "I", "");
-#else
-SYSCTL_OID(_net_inet6_ip6, IPV6CTL_TEMPPLTIME, temppltime,
- CTLTYPE_INT|CTLFLAG_RW, &ip6_temp_preferred_lifetime, 0,
- sysctl_ip6_temppltime, "I", "");
-SYSCTL_OID(_net_inet6_ip6, IPV6CTL_TEMPVLTIME, tempvltime,
- CTLTYPE_INT|CTLFLAG_RW, &ip6_temp_valid_lifetime, 0,
- sysctl_ip6_tempvltime, "I", "");
-#endif
SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_V6ONLY,
v6only, CTLFLAG_RW, ip6_v6only, 0, "");
#ifndef VIMAGE
==== //depot/projects/vimage/src/sys/sys/sysctl.h#9 (text+ko) ====
@@ -244,13 +244,19 @@
a1, a2, #name, handler, fmt, 0, __DESCR(descr), 0, 0 }; \
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_v_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) \
- static struct sysctl_v_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)
+ handler, fmt, descr) \
+ SYSCTL_OID(parent, nbr, name, kind, &a1, a2, handler, fmt, descr)
+#endif
#define SYSCTL_ADD_OID(ctx, parent, nbr, name, kind, a1, a2, handler, fmt, descr) \
sysctl_add_oid(ctx, parent, nbr, name, kind, a1, a2, handler, fmt, __DESCR(descr))
More information about the p4-projects
mailing list