summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2014-10-27 14:38:00 +0000
committerhselasky <hselasky@FreeBSD.org>2014-10-27 14:38:00 +0000
commit1f41d295fba2d409098181fe1212b0bbad862311 (patch)
treeba2736123ed8400baf0cb45744b440c6e0eb456d /sys/netinet
parenta3704ff4d46f150fc2e004a6f0f75c57047b967c (diff)
downloadFreeBSD-src-1f41d295fba2d409098181fe1212b0bbad862311.zip
FreeBSD-src-1f41d295fba2d409098181fe1212b0bbad862311.tar.gz
MFC r263710, r273377, r273378, r273423 and r273455:
- De-vnet hash sizes and hash masks. - Fix multiple issues related to arguments passed to SYSCTL macros. Sponsored by: Mellanox Technologies
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/cc/cc_chd.c4
-rw-r--r--sys/netinet/tcp_reass.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/cc/cc_chd.c b/sys/netinet/cc/cc_chd.c
index 5f64f6c..5168d5f 100644
--- a/sys/netinet/cc/cc_chd.c
+++ b/sys/netinet/cc/cc_chd.c
@@ -484,11 +484,11 @@ SYSCTL_VNET_PROC(_net_inet_tcp_cc_chd, OID_AUTO, queue_threshold,
"IU", "Queueing congestion threshold in ticks");
SYSCTL_VNET_UINT(_net_inet_tcp_cc_chd, OID_AUTO, queue_min,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(chd_qmin), 5,
+ CTLFLAG_RW, &VNET_NAME(chd_qmin), 5,
"Minimum queueing delay threshold in ticks");
SYSCTL_VNET_UINT(_net_inet_tcp_cc_chd, OID_AUTO, use_max,
- CTLTYPE_UINT|CTLFLAG_RW, &VNET_NAME(chd_use_max), 1,
+ CTLFLAG_RW, &VNET_NAME(chd_use_max), 1,
"Use the maximum RTT seen within the measurement period (RTT) "
"as the basic delay measurement for the algorithm.");
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index f0af825..119a94f 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -92,7 +92,7 @@ SYSCTL_VNET_PROC(_net_inet_tcp_reass, OID_AUTO, cursegments,
static VNET_DEFINE(int, tcp_reass_overflows) = 0;
#define V_tcp_reass_overflows VNET(tcp_reass_overflows)
SYSCTL_VNET_INT(_net_inet_tcp_reass, OID_AUTO, overflows,
- CTLTYPE_INT | CTLFLAG_RD,
+ CTLFLAG_RD,
&VNET_NAME(tcp_reass_overflows), 0,
"Global number of TCP Segment Reassembly Queue Overflows");
OpenPOWER on IntegriCloud