DLPX-25998 TCP congestion control is inadequate
Reviewed at: http://reviews.delphix.com/r/34808/
DLPX-37540 TCP per-connection kernel statistics DLPX-37544 connstat command to display per-connection TCP statistics

@@ -93,10 +93,11 @@
 #include <inet/ip_ndp.h>
 #include <inet/ip_listutils.h>
 #include <netinet/igmp.h>
 #include <netinet/ip_mroute.h>
 #include <inet/ipp_common.h>
+#include <inet/cc.h>
 
 #include <net/pfkeyv2.h>
 #include <inet/sadb.h>
 #include <inet/ipsec_impl.h>
 #include <inet/iptun/iptun_impl.h>

@@ -4565,10 +4566,12 @@
                     "ip_ddi_init: ip_minor_arena_sa creation failed\n");
         }
 #endif
         ip_poll_normal_ticks = MSEC_TO_TICK_ROUNDUP(ip_poll_normal_ms);
 
+        cc_init();
+
         ipcl_g_init();
         ip_ire_g_init();
         ip_net_g_init();
 
 #ifdef DEBUG

@@ -9636,17 +9639,23 @@
 
         if (level != MIB2_TCP) {
                 if ((mpctl = udp_snmp_get(q, mpctl, legacy_req)) == NULL) {
                         return (1);
                 }
+                if (level == MIB2_UDP) {
+                        goto done;
         }
+        }
 
         if (level != MIB2_UDP) {
                 if ((mpctl = tcp_snmp_get(q, mpctl, legacy_req)) == NULL) {
                         return (1);
                 }
+                if (level == MIB2_TCP) {
+                        goto done;
         }
+        }
 
         if ((mpctl = ip_snmp_get_mib2_ip_traffic_stats(q, mpctl,
             ipst, legacy_req)) == NULL) {
                 return (1);
         }

@@ -9718,10 +9727,11 @@
                 return (1);
         }
         if ((mpctl = ip_snmp_get_mib2_ip_dce(q, mpctl, ipst)) == NULL) {
                 return (1);
         }
+done:
         freemsg(mpctl);
         return (1);
 }
 
 /* Get global (legacy) IPv4 statistics */