From owner-p4-projects@FreeBSD.ORG Tue Jun 21 07:25:29 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0E501065670; Tue, 21 Jun 2011 07:25:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76A83106564A for ; Tue, 21 Jun 2011 07:25:29 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 621A98FC0A for ; Tue, 21 Jun 2011 07:25:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5L7PT5q027192 for ; Tue, 21 Jun 2011 07:25:29 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5L7PTX3027189 for perforce@freebsd.org; Tue, 21 Jun 2011 07:25:29 GMT (envelope-from cnicutar@freebsd.org) Date: Tue, 21 Jun 2011 07:25:29 GMT Message-Id: <201106210725.p5L7PTX3027189@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2011 07:25:30 -0000 http://p4web.freebsd.org/@@195085?ac=10 Change 195085 by cnicutar@cnicutar_cronos on 2011/06/21 07:24:32 Fix ABI compatibility (broken in 194756) Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_var.h#3 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_var.h#3 (text+ko) ==== @@ -198,14 +198,15 @@ int t_sndzerowin; /* zero-window updates sent */ - uint32_t snd_uto; /* sent timeout */ - uint32_t rcv_uto; /* received suggestion from peer */ void *t_pspare2[6]; /* 2 CC / 4 TBD */ - uint64_t _pad[9]; /* 6 UTO, 3 TBD (1-2 CC/RTT?) */ + uint64_t _pad[8]; /* 5 UTO, 3 TBD (1-2 CC/RTT?) */ uint64_t t_sndrexmitpack;/* retransmit packets sent */ uint64_t t_rcvoopack; /* out-of-order packets received */ + + uint64_t snd_uto; /* sent timeout */ + uint64_t rcv_uto; /* received suggestion from peer */ }; /* @@ -575,6 +576,7 @@ VNET_DECLARE(int, path_mtu_discovery); VNET_DECLARE(int, ss_fltsz); VNET_DECLARE(int, ss_fltsz_local); +VNET_DECLARE(int, uto_enable); VNET_DECLARE(int, uto_min_timeout); VNET_DECLARE(int, uto_max_timeout); VNET_DECLARE(int, uto_def_timeout); @@ -591,6 +593,7 @@ #define V_path_mtu_discovery VNET(path_mtu_discovery) #define V_ss_fltsz VNET(ss_fltsz) #define V_ss_fltsz_local VNET(ss_fltsz_local) +#define V_uto_enable VNET(uto_enable) #define V_uto_min_timeout VNET(uto_min_timeout) #define V_uto_max_timeout VNET(uto_max_timeout) #define V_uto_def_timeout VNET(uto_def_timeout)