Author: zec
Date: Sat May  2 08:16:26 2009
New Revision: 191738
URL: http://svn.freebsd.org/changeset/base/191738

Log:
  Make indentation more uniform accross vnet container structs.
  
  This is a purely cosmetic / NOP change.
  
  Reviewed by:  bz
  Approved by:  julian (mentor)
  Verified by:  svn diff -x -w producing no output

Modified:
  head/sys/net/if_gif.h
  head/sys/net/vnet.h
  head/sys/netinet/ip_fw.h
  head/sys/netinet/vinet.h
  head/sys/netinet6/vinet6.h
  head/sys/netipsec/vipsec.h

Modified: head/sys/net/if_gif.h
==============================================================================
--- head/sys/net/if_gif.h       Sat May  2 07:02:31 2009        (r191737)
+++ head/sys/net/if_gif.h       Sat May  2 08:16:26 2009        (r191738)
@@ -117,11 +117,11 @@ int gif_encapcheck(const struct mbuf *, 
  */
 
 struct vnet_gif {
-       LIST_HEAD(, gif_softc) _gif_softc_list;
-       int     _max_gif_nesting;
-       int     _parallel_tunnels;
-       int     _ip_gif_ttl;
-       int     _ip6_gif_hlim;
+       LIST_HEAD(, gif_softc)  _gif_softc_list;
+       int                     _max_gif_nesting;
+       int                     _parallel_tunnels;
+       int                     _ip_gif_ttl;
+       int                     _ip6_gif_hlim;
 };
 
 #ifndef VIMAGE

Modified: head/sys/net/vnet.h
==============================================================================
--- head/sys/net/vnet.h Sat May  2 07:02:31 2009        (r191737)
+++ head/sys/net/vnet.h Sat May  2 08:16:26 2009        (r191738)
@@ -36,25 +36,25 @@
 #include <net/if_var.h>
 
 struct vnet_net {
-       int     _if_index;
-       struct  ifindex_entry *_ifindex_table;
-       struct  ifnethead _ifnet;
-       struct  ifgrouphead _ifg_head;
+       int                     _if_index;
+       struct ifindex_entry *  _ifindex_table;
+       struct ifnethead        _ifnet;
+       struct ifgrouphead      _ifg_head;
 
-       int     _if_indexlim;
-       struct  knlist _ifklist;
+       int                     _if_indexlim;
+       struct knlist           _ifklist;
 
-       struct  rtstat _rtstat;
-       struct  radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1];
-       int     _rttrash;
-       uma_zone_t _rtzone;
+       struct rtstat           _rtstat;
+       struct radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1];
+       int                     _rttrash;
+       uma_zone_t              _rtzone;
 
-       struct  ifnet *_loif;
-       LIST_HEAD(, lo_softc) _lo_list;
+       struct ifnet *          _loif;
+       LIST_HEAD(, lo_softc)   _lo_list;
 
-       LIST_HEAD(, rawcb) _rawcb_list;
+       LIST_HEAD(, rawcb)      _rawcb_list;
 
-       int     _ether_ipfw;
+       int                     _ether_ipfw;
 };
 
 /* Size guard. See sys/vimage.h. */

Modified: head/sys/netinet/ip_fw.h
==============================================================================
--- head/sys/netinet/ip_fw.h    Sat May  2 07:02:31 2009        (r191737)
+++ head/sys/netinet/ip_fw.h    Sat May  2 08:16:26 2009        (r191738)
@@ -689,33 +689,33 @@ struct eventhandler_entry;
  * Stack virtualization support.
  */
 struct vnet_ipfw {
-       int     _fw_enable;
-       int     _fw6_enable;
-       u_int32_t _set_disable;
-       int     _fw_deny_unknown_exthdrs;
-       int     _fw_verbose;
-       int     _verbose_limit;
-       int     _autoinc_step;
-       ipfw_dyn_rule **_ipfw_dyn_v;
-       uma_zone_t _ipfw_dyn_rule_zone;
-       struct ip_fw_chain _layer3_chain;
-       u_int32_t _dyn_buckets;
-       u_int32_t _curr_dyn_buckets;
-       u_int32_t _dyn_ack_lifetime;
-       u_int32_t _dyn_syn_lifetime;
-       u_int32_t _dyn_fin_lifetime;
-       u_int32_t _dyn_rst_lifetime;
-       u_int32_t _dyn_udp_lifetime;
-       u_int32_t _dyn_short_lifetime;
-       u_int32_t _dyn_keepalive_interval;
-       u_int32_t _dyn_keepalive_period;
-       u_int32_t _dyn_keepalive;
-       u_int32_t _static_count;
-       u_int32_t _static_len;
-       u_int32_t _dyn_count;
-       u_int32_t _dyn_max;
-       u_int64_t _norule_counter;
-       struct callout _ipfw_timeout;
+       int                     _fw_enable;
+       int                     _fw6_enable;
+       u_int32_t               _set_disable;
+       int                     _fw_deny_unknown_exthdrs;
+       int                     _fw_verbose;
+       int                     _verbose_limit;
+       int                     _autoinc_step;
+       ipfw_dyn_rule **        _ipfw_dyn_v;
+       uma_zone_t              _ipfw_dyn_rule_zone;
+       struct ip_fw_chain      _layer3_chain;
+       u_int32_t               _dyn_buckets;
+       u_int32_t               _curr_dyn_buckets;
+       u_int32_t               _dyn_ack_lifetime;
+       u_int32_t               _dyn_syn_lifetime;
+       u_int32_t               _dyn_fin_lifetime;
+       u_int32_t               _dyn_rst_lifetime;
+       u_int32_t               _dyn_udp_lifetime;
+       u_int32_t               _dyn_short_lifetime;
+       u_int32_t               _dyn_keepalive_interval;
+       u_int32_t               _dyn_keepalive_period;
+       u_int32_t               _dyn_keepalive;
+       u_int32_t               _static_count;
+       u_int32_t               _static_len;
+       u_int32_t               _dyn_count;
+       u_int32_t               _dyn_max;
+       u_int64_t               _norule_counter;
+       struct callout          _ipfw_timeout;
        struct eventhandler_entry *_ifaddr_event_tag;
 };
 

Modified: head/sys/netinet/vinet.h
==============================================================================
--- head/sys/netinet/vinet.h    Sat May  2 07:02:31 2009        (r191737)
+++ head/sys/netinet/vinet.h    Sat May  2 08:16:26 2009        (r191738)
@@ -51,166 +51,166 @@
 #include <netinet/udp_var.h>
 
 struct vnet_inet {
-       struct  in_ifaddrhashhead *_in_ifaddrhashtbl;
-       struct  in_ifaddrhead _in_ifaddrhead;
-       u_long  _in_ifaddrhmask;
-
-       int     _arpt_keep;
-       int     _arp_maxtries;
-       int     _useloopback;
-       int     _arp_proxyall;
-       int     _subnetsarelocal;
-       int     _sameprefixcarponly;
-
-       int     _ipforwarding;
-       int     _ipstealth;
-       int     _ipfastforward_active;
-       int     _ipsendredirects;
-       int     _ip_defttl;
-       int     _ip_keepfaith;
-       int     _ip_sendsourcequench;
-       int     _ip_do_randomid;
-       int     _ip_checkinterface;
-       int     _ip_output_flowtable_size;
-       u_short _ip_id;
-
-       uma_zone_t _ipq_zone;
-       int     _nipq;                  /* Total # of reass queues */
-       int     _maxnipq;               /* Admin. limit on # reass queues. */
-       int     _maxfragsperpacket;
+       struct in_ifaddrhashhead *_in_ifaddrhashtbl;
+       struct in_ifaddrhead    _in_ifaddrhead;
+       u_long                  _in_ifaddrhmask;
+
+       int                     _arpt_keep;
+       int                     _arp_maxtries;
+       int                     _useloopback;
+       int                     _arp_proxyall;
+       int                     _subnetsarelocal;
+       int                     _sameprefixcarponly;
+
+       int                     _ipforwarding;
+       int                     _ipstealth;
+       int                     _ipfastforward_active;
+       int                     _ipsendredirects;
+       int                     _ip_defttl;
+       int                     _ip_keepfaith;
+       int                     _ip_sendsourcequench;
+       int                     _ip_do_randomid;
+       int                     _ip_checkinterface;
+       int                     _ip_output_flowtable_size;
+       u_short                 _ip_id;
+
+       uma_zone_t              _ipq_zone;
+       int                     _nipq;    /* Total # of reass queues */
+       int                     _maxnipq; /* Admin. limit on # reass queues. */
+       int                     _maxfragsperpacket;
        TAILQ_HEAD(ipqhead, ipq) _ipq[IPREASS_NHASH];
 
-       struct  inpcbhead _tcb;         /* head of queue of active tcpcb's */
-       struct  inpcbinfo _tcbinfo;
-       struct  tcpstat _tcpstat;       /* tcp statistics */
-       struct  tcp_hostcache _tcp_hostcache;
-       struct  callout _tcp_hc_callout;
-
-       uma_zone_t _tcp_reass_zone;
-       uma_zone_t _tcpcb_zone;
-       uma_zone_t _tcptw_zone;
-       uma_zone_t _sack_hole_zone;
-
-       struct  tcp_syncache _tcp_syncache;
-       int     _tcp_syncookies;
-       int     _tcp_syncookiesonly;
-       int     _tcp_sc_rst_sock_fail;
-
-       struct  inpcbhead _divcb;
-       struct  inpcbinfo _divcbinfo;
-       TAILQ_HEAD(, tcptw) _twq_2msl;
-
-       int     _tcp_mssdflt;
-       int     _tcp_v6mssdflt;
-       int     _tcp_minmss;
-       int     _tcp_do_rfc1323;
-       int     _icmp_may_rst;
-       int     _tcp_isn_reseed_interval;
-       int     _tcp_inflight_enable;
-       int     _tcp_inflight_rttthresh;
-       int     _tcp_inflight_min;
-       int     _tcp_inflight_max;
-       int     _tcp_inflight_stab;
-       int     _nolocaltimewait;
-       int     _path_mtu_discovery;
-       int     _ss_fltsz;
-       int     _ss_fltsz_local;
-       int     _tcp_do_newreno;
-       int     _tcp_do_tso;
-       int     _tcp_do_autosndbuf;
-       int     _tcp_autosndbuf_inc;
-       int     _tcp_autosndbuf_max;
-       int     _tcp_do_sack;
-       int     _tcp_sack_maxholes;
-       int     _tcp_sack_globalmaxholes;
-       int     _tcp_sack_globalholes;
-       int     _blackhole;
-       int     _tcp_delack_enabled;
-       int     _drop_synfin;
-       int     _tcp_do_rfc3042;
-       int     _tcp_do_rfc3390;
-       int     _tcp_do_rfc3465;
-       int     _tcp_abc_l_var;
-       int     _tcp_do_ecn;
-       int     _tcp_ecn_maxretries;
-       int     _tcp_insecure_rst;
-       int     _tcp_do_autorcvbuf;
-       int     _tcp_autorcvbuf_inc;
-       int     _tcp_autorcvbuf_max;
-       int     _tcp_reass_maxseg;
-       int     _tcp_reass_qsize;
-       int     _tcp_reass_maxqlen;
-       int     _tcp_reass_overflows;
-
-       u_char  _isn_secret[32];
-       int     _isn_last_reseed;
-       u_int32_t _isn_offset;
-       u_int32_t _isn_offset_old;
-
-       struct  inpcbhead _udb;
-       struct  inpcbinfo _udbinfo;
-       struct  udpstat _udpstat;
-       int     _udp_blackhole;
-
-       struct  inpcbhead _ripcb;
-       struct  inpcbinfo _ripcbinfo;
-       struct  socket *_ip_mrouter;
-
-       struct  socket *_ip_rsvpd;
-       int     _ip_rsvp_on;
-       int     _rsvp_on;
-
-       struct  icmpstat _icmpstat;
-       struct  ipstat _ipstat;
-
-       LIST_HEAD(, igmp_ifinfo)         _igi_head;
-       struct igmpstat  _igmpstat;
-       int              _interface_timers_running;
-       int              _state_change_timers_running;
-       int              _current_state_timers_running;
-       int              _igmp_recvifkludge;
-       int              _igmp_sendra;
-       int              _igmp_sendlocal;
-       int              _igmp_v1enable;
-       int              _igmp_v2enable;
-       int              _igmp_legacysupp;
-       int              _igmp_sgalloc;
-       int              _igmp_default_version;
-       struct timeval   _igmp_gsrdelay;
-
-       int     _rtq_timeout;
-       int     _rtq_reallyold;
-       int     _rtq_minreallyold;
-       int     _rtq_toomany;
-       struct  callout _rtq_timer;
-
-       int     _ipport_lowfirstauto;
-       int     _ipport_lowlastauto;
-       int     _ipport_firstauto;
-       int     _ipport_lastauto;
-       int     _ipport_hifirstauto;
-       int     _ipport_hilastauto;
-       int     _ipport_reservedhigh;
-       int     _ipport_reservedlow;
-       int     _ipport_randomized;
-       int     _ipport_randomcps;
-       int     _ipport_randomtime;
-       int     _ipport_stoprandom;
-       int     _ipport_tcpallocs;
-       int     _ipport_tcplastcount;
-
-       int     _icmpmaskrepl;
-       u_int   _icmpmaskfake;
-       int     _drop_redirect;
-       int     _log_redirect;
-       int     _icmplim;
-       int     _icmplim_output;
-       char    _reply_src[IFNAMSIZ];
-       int     _icmp_rfi;
-       int     _icmp_quotelen;
-       int     _icmpbmcastecho;
+       struct inpcbhead        _tcb;   /* head of queue of active tcpcb's */
+       struct inpcbinfo        _tcbinfo;
+       struct tcpstat          _tcpstat; /* tcp statistics */
+       struct tcp_hostcache    _tcp_hostcache;
+       struct callout          _tcp_hc_callout;
+
+       uma_zone_t              _tcp_reass_zone;
+       uma_zone_t              _tcpcb_zone;
+       uma_zone_t              _tcptw_zone;
+       uma_zone_t              _sack_hole_zone;
+
+       struct tcp_syncache     _tcp_syncache;
+       int                     _tcp_syncookies;
+       int                     _tcp_syncookiesonly;
+       int                     _tcp_sc_rst_sock_fail;
+
+       struct inpcbhead        _divcb;
+       struct inpcbinfo        _divcbinfo;
+       TAILQ_HEAD(, tcptw)     _twq_2msl;
+
+       int                     _tcp_mssdflt;
+       int                     _tcp_v6mssdflt;
+       int                     _tcp_minmss;
+       int                     _tcp_do_rfc1323;
+       int                     _icmp_may_rst;
+       int                     _tcp_isn_reseed_interval;
+       int                     _tcp_inflight_enable;
+       int                     _tcp_inflight_rttthresh;
+       int                     _tcp_inflight_min;
+       int                     _tcp_inflight_max;
+       int                     _tcp_inflight_stab;
+       int                     _nolocaltimewait;
+       int                     _path_mtu_discovery;
+       int                     _ss_fltsz;
+       int                     _ss_fltsz_local;
+       int                     _tcp_do_newreno;
+       int                     _tcp_do_tso;
+       int                     _tcp_do_autosndbuf;
+       int                     _tcp_autosndbuf_inc;
+       int                     _tcp_autosndbuf_max;
+       int                     _tcp_do_sack;
+       int                     _tcp_sack_maxholes;
+       int                     _tcp_sack_globalmaxholes;
+       int                     _tcp_sack_globalholes;
+       int                     _blackhole;
+       int                     _tcp_delack_enabled;
+       int                     _drop_synfin;
+       int                     _tcp_do_rfc3042;
+       int                     _tcp_do_rfc3390;
+       int                     _tcp_do_rfc3465;
+       int                     _tcp_abc_l_var;
+       int                     _tcp_do_ecn;
+       int                     _tcp_ecn_maxretries;
+       int                     _tcp_insecure_rst;
+       int                     _tcp_do_autorcvbuf;
+       int                     _tcp_autorcvbuf_inc;
+       int                     _tcp_autorcvbuf_max;
+       int                     _tcp_reass_maxseg;
+       int                     _tcp_reass_qsize;
+       int                     _tcp_reass_maxqlen;
+       int                     _tcp_reass_overflows;
+
+       u_char                  _isn_secret[32];
+       int                     _isn_last_reseed;
+       u_int32_t               _isn_offset;
+       u_int32_t               _isn_offset_old;
+
+       struct inpcbhead        _udb;
+       struct inpcbinfo        _udbinfo;
+       struct udpstat          _udpstat;
+       int                     _udp_blackhole;
+
+       struct inpcbhead        _ripcb;
+       struct inpcbinfo        _ripcbinfo;
+       struct socket *         _ip_mrouter;
+
+       struct socket *         _ip_rsvpd;
+       int                     _ip_rsvp_on;
+       int                     _rsvp_on;
+
+       struct icmpstat         _icmpstat;
+       struct ipstat           _ipstat;
+
+       LIST_HEAD(, igmp_ifinfo) _igi_head;
+       struct igmpstat         _igmpstat;
+       int                     _interface_timers_running;
+       int                     _state_change_timers_running;
+       int                     _current_state_timers_running;
+       int                     _igmp_recvifkludge;
+       int                     _igmp_sendra;
+       int                     _igmp_sendlocal;
+       int                     _igmp_v1enable;
+       int                     _igmp_v2enable;
+       int                     _igmp_legacysupp;
+       int                     _igmp_sgalloc;
+       int                     _igmp_default_version;
+       struct timeval          _igmp_gsrdelay;
+
+       int                     _rtq_timeout;
+       int                     _rtq_reallyold;
+       int                     _rtq_minreallyold;
+       int                     _rtq_toomany;
+       struct callout          _rtq_timer;
+
+       int                     _ipport_lowfirstauto;
+       int                     _ipport_lowlastauto;
+       int                     _ipport_firstauto;
+       int                     _ipport_lastauto;
+       int                     _ipport_hifirstauto;
+       int                     _ipport_hilastauto;
+       int                     _ipport_reservedhigh;
+       int                     _ipport_reservedlow;
+       int                     _ipport_randomized;
+       int                     _ipport_randomcps;
+       int                     _ipport_randomtime;
+       int                     _ipport_stoprandom;
+       int                     _ipport_tcpallocs;
+       int                     _ipport_tcplastcount;
+
+       int                     _icmpmaskrepl;
+       u_int                   _icmpmaskfake;
+       int                     _drop_redirect;
+       int                     _log_redirect;
+       int                     _icmplim;
+       int                     _icmplim_output;
+       char                    _reply_src[IFNAMSIZ];
+       int                     _icmp_rfi;
+       int                     _icmp_quotelen;
+       int                     _icmpbmcastecho;
 
-       int     _fw_one_pass;
+       int                     _fw_one_pass;
 };
 
 /* Size guard. See sys/vimage.h. */

Modified: head/sys/netinet6/vinet6.h
==============================================================================
--- head/sys/netinet6/vinet6.h  Sat May  2 07:02:31 2009        (r191737)
+++ head/sys/netinet6/vinet6.h  Sat May  2 08:16:26 2009        (r191738)
@@ -48,112 +48,112 @@
 #include <netinet6/scope6_var.h>
 
 struct vnet_inet6 {
-       struct in6_ifaddr *             _in6_ifaddr;
+       struct in6_ifaddr *     _in6_ifaddr;
 
-       u_int                           _frag6_nfragpackets;
-       u_int                           _frag6_nfrags;
-       struct ip6q                     _ip6q;
+       u_int                   _frag6_nfragpackets;
+       u_int                   _frag6_nfrags;
+       struct ip6q             _ip6q;
 
-       struct in6_addrpolicy           _defaultaddrpolicy;
+       struct in6_addrpolicy   _defaultaddrpolicy;
        TAILQ_HEAD(, addrsel_policyent) _addrsel_policytab;
-       u_int                           _in6_maxmtu;
-       int                             _ip6_auto_linklocal;
-       int                             _rtq_minreallyold6;
-       int                             _rtq_reallyold6;
-       int                             _rtq_toomany6;
-
-       struct ip6stat                  _ip6stat;
-       struct rip6stat                 _rip6stat;
-       struct icmp6stat                _icmp6stat;
-
-       int                             _rtq_timeout6;  
-       struct callout                  _rtq_timer6;
-       struct callout                  _rtq_mtutimer;
-       struct callout                  _nd6_slowtimo_ch;
-       struct callout                  _nd6_timer_ch;
-       struct callout                  _in6_tmpaddrtimer_ch;
-
-       int                             _nd6_inuse;
-       int                             _nd6_allocated;
-       int                             _nd6_onlink_ns_rfc4861;
-       struct nd_drhead                _nd_defrouter;
-       struct nd_prhead                _nd_prefix;
-       struct ifnet *                  _nd6_defifp;
-       int                             _nd6_defifindex;
-
-       struct scope6_id                _sid_default;
-
-       TAILQ_HEAD(, dadq)              _dadq;
-       int                             _dad_init;
-
-       int                             _icmp6errpps_count;
-       struct timeval                  _icmp6errppslim_last;
-
-       int                             _ip6_forwarding;
-       int                             _ip6_sendredirects;
-       int                             _ip6_defhlim;
-       int                             _ip6_defmcasthlim;
-       int                             _ip6_accept_rtadv;
-       int                             _ip6_maxfragpackets;
-       int                             _ip6_maxfrags;
-       int                             _ip6_log_interval;
-       int                             _ip6_hdrnestlimit;
-       int                             _ip6_dad_count;
-       int                             _ip6_auto_flowlabel;
-       int                             _ip6_use_deprecated;
-       int                             _ip6_rr_prune;
-       int                             _ip6_mcast_pmtu;
-       int                             _ip6_v6only;
-       int                             _ip6_keepfaith;
-       int                             _ip6stealth;
-       time_t                          _ip6_log_time;
-
-       int                             _pmtu_expire;
-       int                             _pmtu_probe;
-       u_long                          _rip6_sendspace;
-       u_long                          _rip6_recvspace;
-       int                             _icmp6_rediraccept;
-       int                             _icmp6_redirtimeout;
-       int                             _icmp6errppslim;
-       int                             _icmp6_nodeinfo;
-       int                             _udp6_sendspace;
-       int                             _udp6_recvspace;
-       int                             _ip6qmaxlen;
-       int                             _ip6_prefer_tempaddr;
-
-       int                             _nd6_prune;
-       int                             _nd6_delay;
-       int                             _nd6_umaxtries;
-       int                             _nd6_mmaxtries;
-       int                             _nd6_useloopback;
-       int                             _nd6_gctimer;
-       int                             _nd6_maxndopt;
-       int                             _nd6_maxnudhint;
-       int                             _nd6_maxqueuelen;
-       int                             _nd6_debug;
-       int                             _nd6_recalc_reachtm_interval;
-       int                             _dad_ignore_ns;
-       int                             _dad_maxtry;
-       int                             _ip6_use_tempaddr;
-       int                             _ip6_desync_factor;
-       u_int32_t                       _ip6_temp_preferred_lifetime;
-       u_int32_t                       _ip6_temp_valid_lifetime;
-
-       struct socket *                 _ip6_mrouter;
-       int                             _ip6_mrouter_ver;
-       int                             _pim6;
-       u_int                           _mrt6debug;
-
-       int                             _ip6_temp_regen_advance;
-       int                             _ip6_use_defzone;
-
-       struct ip6_pktopts              _ip6_opts;
-
-       struct timeval                  _mld_gsrdelay;
-       LIST_HEAD(, mld_ifinfo)         _mli_head;
-       int                             _interface_timers_running6;
-       int                             _state_change_timers_running6;
-       int                             _current_state_timers_running6;
+       u_int                   _in6_maxmtu;
+       int                     _ip6_auto_linklocal;
+       int                     _rtq_minreallyold6;
+       int                     _rtq_reallyold6;
+       int                     _rtq_toomany6;
+
+       struct ip6stat          _ip6stat;
+       struct rip6stat         _rip6stat;
+       struct icmp6stat        _icmp6stat;
+
+       int                     _rtq_timeout6;  
+       struct callout          _rtq_timer6;
+       struct callout          _rtq_mtutimer;
+       struct callout          _nd6_slowtimo_ch;
+       struct callout          _nd6_timer_ch;
+       struct callout          _in6_tmpaddrtimer_ch;
+
+       int                     _nd6_inuse;
+       int                     _nd6_allocated;
+       int                     _nd6_onlink_ns_rfc4861;
+       struct nd_drhead        _nd_defrouter;
+       struct nd_prhead        _nd_prefix;
+       struct ifnet *          _nd6_defifp;
+       int                     _nd6_defifindex;
+
+       struct scope6_id        _sid_default;
+
+       TAILQ_HEAD(, dadq)      _dadq;
+       int                     _dad_init;
+
+       int                     _icmp6errpps_count;
+       struct timeval          _icmp6errppslim_last;
+
+       int                     _ip6_forwarding;
+       int                     _ip6_sendredirects;
+       int                     _ip6_defhlim;
+       int                     _ip6_defmcasthlim;
+       int                     _ip6_accept_rtadv;
+       int                     _ip6_maxfragpackets;
+       int                     _ip6_maxfrags;
+       int                     _ip6_log_interval;
+       int                     _ip6_hdrnestlimit;
+       int                     _ip6_dad_count;
+       int                     _ip6_auto_flowlabel;
+       int                     _ip6_use_deprecated;
+       int                     _ip6_rr_prune;
+       int                     _ip6_mcast_pmtu;
+       int                     _ip6_v6only;
+       int                     _ip6_keepfaith;
+       int                     _ip6stealth;
+       time_t                  _ip6_log_time;
+
+       int                     _pmtu_expire;
+       int                     _pmtu_probe;
+       u_long                  _rip6_sendspace;
+       u_long                  _rip6_recvspace;
+       int                     _icmp6_rediraccept;
+       int                     _icmp6_redirtimeout;
+       int                     _icmp6errppslim;
+       int                     _icmp6_nodeinfo;
+       int                     _udp6_sendspace;
+       int                     _udp6_recvspace;
+       int                     _ip6qmaxlen;
+       int                     _ip6_prefer_tempaddr;
+
+       int                     _nd6_prune;
+       int                     _nd6_delay;
+       int                     _nd6_umaxtries;
+       int                     _nd6_mmaxtries;
+       int                     _nd6_useloopback;
+       int                     _nd6_gctimer;
+       int                     _nd6_maxndopt;
+       int                     _nd6_maxnudhint;
+       int                     _nd6_maxqueuelen;
+       int                     _nd6_debug;
+       int                     _nd6_recalc_reachtm_interval;
+       int                     _dad_ignore_ns;
+       int                     _dad_maxtry;
+       int                     _ip6_use_tempaddr;
+       int                     _ip6_desync_factor;
+       u_int32_t               _ip6_temp_preferred_lifetime;
+       u_int32_t               _ip6_temp_valid_lifetime;
+
+       struct socket *         _ip6_mrouter;
+       int                     _ip6_mrouter_ver;
+       int                     _pim6;
+       u_int                   _mrt6debug;
+
+       int                     _ip6_temp_regen_advance;
+       int                     _ip6_use_defzone;
+
+       struct ip6_pktopts      _ip6_opts;
+
+       struct timeval          _mld_gsrdelay;
+       LIST_HEAD(, mld_ifinfo) _mli_head;
+       int                     _interface_timers_running6;
+       int                     _state_change_timers_running6;
+       int                     _current_state_timers_running6;
 };
 
 /* Size guard. See sys/vimage.h. */

Modified: head/sys/netipsec/vipsec.h
==============================================================================
--- head/sys/netipsec/vipsec.h  Sat May  2 07:02:31 2009        (r191737)
+++ head/sys/netipsec/vipsec.h  Sat May  2 08:16:26 2009        (r191738)
@@ -47,8 +47,8 @@
 
 struct vnet_ipsec {
        int                     _ipsec_debug;
-       struct  ipsecstat       _ipsec4stat;
-       struct  secpolicy       _ip4_def_policy;
+       struct ipsecstat        _ipsec4stat;
+       struct secpolicy        _ip4_def_policy;
 
        int                     _ip4_esp_trans_deflev;
        int                     _ip4_esp_net_deflev;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to