From owner-p4-projects@FreeBSD.ORG Fri Aug 15 11:54:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CD38106567E; Fri, 15 Aug 2008 11:54:10 +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 D6A1A106566C for ; Fri, 15 Aug 2008 11:54:09 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B4B3B8FC0C for ; Fri, 15 Aug 2008 11:54:09 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FBs9XM070848 for ; Fri, 15 Aug 2008 11:54:09 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FBs80r070846 for perforce@freebsd.org; Fri, 15 Aug 2008 11:54:08 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 15 Aug 2008 11:54:08 GMT Message-Id: <200808151154.m7FBs80r070846@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 11:54:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=147441 Change 147441 by zec@zec_tinderbox on 2008/08/15 11:54:06 Unbreak GENERIC build. Affected files ... .. //depot/projects/vimage-commit/src/sys/netinet/in.h#3 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#5 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#6 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#7 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.h#4 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#5 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netinet/in.h#3 (text+ko) ==== @@ -1009,6 +1009,8 @@ #define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) #define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) #define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) +#define V_tcp_do_ecn VNET_INET(tcp_do_ecn) +#define V_tcp_ecn_maxretries VNET_INET(tcp_ecn_maxretries) #define V_isn_secret VNET_INET(isn_secret) #define V_isn_last_reseed VNET_INET(isn_last_reseed) ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#5 (text+ko) ==== @@ -133,11 +133,11 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN"); -static int tcp_do_ecn = 0; +int tcp_do_ecn = 0; +int tcp_ecn_maxretries = 1; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, enable, CTLFLAG_RW, tcp_do_ecn, 0, "TCP ECN support"); -static int tcp_ecn_maxretries = 1; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, maxretries, CTLFLAG_RW, tcp_ecn_maxretries, 0, "Max retries before giving up on ECN"); ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#6 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#7 (text+ko) ==== @@ -139,6 +139,7 @@ #define SCF_UNREACH 0x10 /* icmp unreachable received */ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ #define SCF_SACK 0x80 /* send SACK option */ +#define SCF_ECN 0x100 /* send ECN setup packet */ #ifndef TCP_OFFLOAD_DISABLE struct toe_usrreqs *sc_tu; /* TOE operations */ void *sc_toepcb; /* TOE protocol block */ ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.h#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#5 (text+ko) ==== @@ -521,9 +521,6 @@ extern int tcp_sc_rst_sock_fail; /* RST on sock alloc failure */ extern int tcp_do_ecn; /* TCP ECN enabled/disabled */ extern int tcp_ecn_maxretries; -extern int tcp_sack_maxholes; -extern int tcp_sack_globalmaxholes; -extern int tcp_sack_globalholes; extern int tcp_do_tso; extern int tcp_do_autosndbuf; extern int tcp_autosndbuf_max;