Print this page
fixup .text where possible
cstyle sort of updates
7127  remove -Wno-missing-braces from Makefile.uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/inet/iptun/iptun.c
          +++ new/usr/src/uts/common/inet/iptun/iptun.c
↓ open down ↓ 96 lines elided ↑ open up ↑
  97   97  #define IPTUN_MIN_HOPLIMIT      1
  98   98  #define IPTUN_MAX_HOPLIMIT      UINT8_MAX
  99   99  
 100  100  #define IPTUN_MIN_ENCAPLIMIT    0
 101  101  #define IPTUN_MAX_ENCAPLIMIT    UINT8_MAX
 102  102  
 103  103  #define IPTUN_IPSEC_REQ_MASK    (IPSEC_PREF_REQUIRED | IPSEC_PREF_NEVER)
 104  104  
 105  105  static iptun_encaplim_t iptun_encaplim_init = {
 106  106          { IPPROTO_NONE, 0 },
 107      -        IP6OPT_TUNNEL_LIMIT,
 108      -        1,
 109      -        IPTUN_DEFAULT_ENCAPLIMIT,       /* filled in with actual value later */
 110      -        IP6OPT_PADN,
 111      -        1,
 112      -        0
      107 +        {   IP6OPT_TUNNEL_LIMIT,
      108 +            1,
      109 +            IPTUN_DEFAULT_ENCAPLIMIT }, /* filled in with actual value later */
      110 +        {   IP6OPT_PADN,
      111 +            1,
      112 +            0 }
 113  113  };
 114  114  
 115  115  /*
 116  116   * Table containing per-iptun-type information.
 117  117   * Since IPv6 can run over all of these we have the IPv6 min as the min MTU.
 118  118   */
 119  119  static iptun_typeinfo_t iptun_type_table[] = {
 120  120          { IPTUN_TYPE_IPV4, MAC_PLUGIN_IDENT_IPV4, IPV4_VERSION,
 121  121              IPTUN_MIN_IPV6_MTU, IPTUN_MAX_IPV4_MTU,     B_TRUE },
 122  122          { IPTUN_TYPE_IPV6, MAC_PLUGIN_IDENT_IPV6, IPV6_VERSION,
↓ open down ↓ 3387 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX