diff options
Diffstat (limited to 'sys/netinet/tcp_output.c')
| -rw-r--r-- | sys/netinet/tcp_output.c | 76 |
1 files changed, 37 insertions, 39 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 35ba51cadf53..c74107e74a6a 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$"); #ifdef TCPDEBUG #include <netinet/tcp_debug.h> #endif -#include <netinet/vinet.h> #ifdef IPSEC #include <netipsec/ipsec.h> @@ -88,44 +87,45 @@ __FBSDID("$FreeBSD$"); extern struct mbuf *m_copypack(); #endif -#ifdef VIMAGE_GLOBALS -int path_mtu_discovery; -int ss_fltsz; -int ss_fltsz_local; -int tcp_do_newreno; -int tcp_do_tso; -int tcp_do_autosndbuf; -int tcp_autosndbuf_inc; -int tcp_autosndbuf_max; -#endif - -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, path_mtu_discovery, - CTLFLAG_RW, path_mtu_discovery, 1, "Enable Path MTU Discovery"); - -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, - slowstart_flightsize, CTLFLAG_RW, - ss_fltsz, 1, "Slow start flight size"); - -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, - local_slowstart_flightsize, CTLFLAG_RW, - ss_fltsz_local, 1, "Slow start flight size for local networks"); - -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, newreno, CTLFLAG_RW, - tcp_do_newreno, 0, "Enable NewReno Algorithms"); - -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, tso, CTLFLAG_RW, - tcp_do_tso, 0, "Enable TCP Segmentation Offload"); - -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, sendbuf_auto, - CTLFLAG_RW, - tcp_do_autosndbuf, 0, "Enable automatic send buffer sizing"); - -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, sendbuf_inc, - CTLFLAG_RW, tcp_autosndbuf_inc, 0, +VNET_DEFINE(int, path_mtu_discovery); +VNET_DEFINE(int, ss_fltsz); +VNET_DEFINE(int, ss_fltsz_local); +VNET_DEFINE(int, tcp_do_newreno); +VNET_DEFINE(int, tcp_do_tso); +VNET_DEFINE(int, tcp_do_autosndbuf); +VNET_DEFINE(int, tcp_autosndbuf_inc); +VNET_DEFINE(int, tcp_autosndbuf_max); + +SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, path_mtu_discovery, CTLFLAG_RW, + &VNET_NAME(path_mtu_discovery), 1, + "Enable Path MTU Discovery"); + +SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, slowstart_flightsize, CTLFLAG_RW, + &VNET_NAME(ss_fltsz), 1, + "Slow start flight size"); + +SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, local_slowstart_flightsize, + CTLFLAG_RW, &VNET_NAME(ss_fltsz_local), 1, + "Slow start flight size for local networks"); + +SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, newreno, CTLFLAG_RW, + &VNET_NAME(tcp_do_newreno), 0, + "Enable NewReno Algorithms"); + +SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, tso, CTLFLAG_RW, + &VNET_NAME(tcp_do_tso), 0, + "Enable TCP Segmentation Offload"); + +SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, sendbuf_auto, CTLFLAG_RW, + &VNET_NAME(tcp_do_autosndbuf), 0, + "Enable automatic send buffer sizing"); + +SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, sendbuf_inc, CTLFLAG_RW, + &VNET_NAME(tcp_autosndbuf_inc), 0, "Incrementor step size of automatic send buffer"); -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, sendbuf_max, - CTLFLAG_RW, tcp_autosndbuf_max, 0, +SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, sendbuf_max, CTLFLAG_RW, + &VNET_NAME(tcp_autosndbuf_max), 0, "Max size of automatic send buffer"); @@ -135,7 +135,6 @@ SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, sendbuf_max, int tcp_output(struct tcpcb *tp) { - INIT_VNET_INET(tp->t_inpcb->inp_vnet); struct socket *so = tp->t_inpcb->inp_socket; long len, recwin, sendwin; int off, flags, error; @@ -1328,7 +1327,6 @@ tcp_setpersist(struct tcpcb *tp) int tcp_addoptions(struct tcpopt *to, u_char *optp) { - INIT_VNET_INET(curvnet); u_int mask, optlen = 0; for (mask = 1; mask < TOF_MAXOPT; mask <<= 1) { |