Date: Thu, 22 Jan 2009 14:30:35 +0000 (UTC) From: Lawrence Stewart <lstewart@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r187590 - projects/tcp_cc_8.x/sys/netinet Message-ID: <200901221430.n0MEUZM4014679@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lstewart Date: Thu Jan 22 14:30:35 2009 New Revision: 187590 URL: http://svn.freebsd.org/changeset/base/187590 Log: First pass at integrating with latest vimage changes. Add missing bracket to tcp_input.c that got mashed in the previous MFH. Modified: projects/tcp_cc_8.x/sys/netinet/cc.c projects/tcp_cc_8.x/sys/netinet/cc.h projects/tcp_cc_8.x/sys/netinet/cc_htcp.c projects/tcp_cc_8.x/sys/netinet/tcp_input.c Modified: projects/tcp_cc_8.x/sys/netinet/cc.c ============================================================================== --- projects/tcp_cc_8.x/sys/netinet/cc.c Thu Jan 22 11:27:39 2009 (r187589) +++ projects/tcp_cc_8.x/sys/netinet/cc.c Thu Jan 22 14:30:35 2009 (r187590) @@ -39,20 +39,18 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/rwlock.h> #include <sys/mutex.h> -#include <sys/socket.h> -#include <sys/socketvar.h> -#include <sys/sysctl.h> #include <sys/malloc.h> #include <sys/kernel.h> #include <sys/sbuf.h> +#include <sys/socket.h> +#include <sys/socketvar.h> -#include <netinet/in.h> -#include <netinet/in_pcb.h> -#include <netinet/tcp.h> -#include <netinet/tcp_seq.h> -#include <netinet/tcp_fsm.h> -#include <netinet/cc.h> +#include <net/if.h> +#include <net/if_var.h> +#include <netinet/cc.h> +#include <netinet/tcp_seq.h> +#include <netinet/vinet.h> /* list of available cc algorithms on the current system */ struct cc_head cc_list = STAILQ_HEAD_INITIALIZER(cc_list); @@ -199,8 +197,8 @@ cc_deregister_algorithm(struct cc_algo * * algorithm back to newreno. If the algorithm that was in use requires * deinit code to be run, call it */ - INP_INFO_RLOCK(&tcbinfo); - LIST_FOREACH(inp, &tcb, inp_list) { + INP_INFO_RLOCK(&V_tcbinfo); + LIST_FOREACH(inp, &V_tcb, inp_list) { /* skip tcptw structs */ if (inp->inp_vflag & INP_TIMEWAIT) continue; @@ -223,7 +221,7 @@ cc_deregister_algorithm(struct cc_algo * } INP_WUNLOCK(inp); } - INP_INFO_RUNLOCK(&tcbinfo); + INP_INFO_RUNLOCK(&V_tcbinfo); } return success; @@ -305,7 +303,7 @@ newreno_cwnd_init(struct tcpcb *tp) min(tp->snd_wnd, so->so_snd.sb_hiwat))); else #endif - if (tcp_do_rfc3390) + if (V_tcp_do_rfc3390) tp->snd_cwnd = min(4 * tp->t_maxseg, max(2 * tp->t_maxseg, 4380)); #ifdef INET6 else if ((isipv6 && in6_localaddr(&inp->in6p_faddr)) || @@ -313,9 +311,9 @@ newreno_cwnd_init(struct tcpcb *tp) #else else if (in_localaddr(inp->inp_faddr)) #endif - tp->snd_cwnd = tp->t_maxseg * ss_fltsz_local; + tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz_local; else - tp->snd_cwnd = tp->t_maxseg * ss_fltsz; + tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz; } /* @@ -392,17 +390,17 @@ newreno_after_idle(struct tcpcb *tp) * Set the slow-start flight size depending on whether * this is a local network or not. */ - int ss = ss_fltsz; + int ss = V_ss_fltsz; #ifdef INET6 if (isipv6) { if (in6_localaddr(&tp->t_inpcb->in6p_faddr)) - ss = ss_fltsz_local; + ss = V_ss_fltsz_local; } else #endif /* INET6 */ if (in_localaddr(tp->t_inpcb->inp_faddr)) - ss = ss_fltsz_local; + ss = V_ss_fltsz_local; tp->snd_cwnd = tp->t_maxseg * ss; } Modified: projects/tcp_cc_8.x/sys/netinet/cc.h ============================================================================== --- projects/tcp_cc_8.x/sys/netinet/cc.h Thu Jan 22 11:27:39 2009 (r187589) +++ projects/tcp_cc_8.x/sys/netinet/cc.h Thu Jan 22 14:30:35 2009 (r187590) @@ -35,7 +35,12 @@ #define _NETINET_CC_H_ #include <sys/queue.h> -#include <netinet/tcp_var.h> +#include <sys/sysctl.h> + +#include <netinet/tcp.h> + +/* Forward declaration of required structs. */ +struct tcpcb; /* * Global CC vars Modified: projects/tcp_cc_8.x/sys/netinet/cc_htcp.c ============================================================================== --- projects/tcp_cc_8.x/sys/netinet/cc_htcp.c Thu Jan 22 11:27:39 2009 (r187589) +++ projects/tcp_cc_8.x/sys/netinet/cc_htcp.c Thu Jan 22 14:30:35 2009 (r187590) @@ -47,11 +47,13 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/malloc.h> #include <sys/module.h> -#include <sys/sysctl.h> +#include <sys/socket.h> #include <sys/socketvar.h> + +#include <netinet/cc.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> -#include <netinet/cc.h> +#include <netinet/tcp_var.h> /* useful defines */ #define MODNAME "HTCP congestion control" Modified: projects/tcp_cc_8.x/sys/netinet/tcp_input.c ============================================================================== --- projects/tcp_cc_8.x/sys/netinet/tcp_input.c Thu Jan 22 11:27:39 2009 (r187589) +++ projects/tcp_cc_8.x/sys/netinet/tcp_input.c Thu Jan 22 14:30:35 2009 (r187590) @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #define TCPSTATES /* for logging */ +#include <netinet/cc.h> #include <netinet/in.h> #include <netinet/in_pcb.h> #include <netinet/in_systm.h> @@ -76,7 +77,6 @@ __FBSDID("$FreeBSD$"); #include <netinet6/in6_pcb.h> #include <netinet6/ip6_var.h> #include <netinet6/nd6.h> -#include <netinet/tcp.h> #include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> @@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$"); #include <netinet6/tcp6_var.h> #include <netinet/tcpip.h> #include <netinet/tcp_syncache.h> -#include <netinet/cc.h> #ifdef TCPDEBUG #include <netinet/tcp_debug.h> #endif /* TCPDEBUG */ @@ -2291,6 +2290,7 @@ process_ACK: if (!IN_FASTRECOVERY(tp)) { if (CC_ALGO(tp)->ack_received) CC_ALGO(tp)->ack_received(tp, th); + } SOCKBUF_LOCK(&so->so_snd); if (acked > so->so_snd.sb_cc) { tp->snd_wnd -= so->so_snd.sb_cc;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901221430.n0MEUZM4014679>