From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Tue, 17 Apr 2012 10:26:43 +0000 (+0800)
Subject: socket: Change sysctl names sosnd -> sosend, no functional changes
X-Git-Tag: v3.2.0~1096
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/0df7608b226e4ad0abf093ea14497079306ed4e3?ds=sidebyside

socket: Change sysctl names sosnd -> sosend, no functional changes
---

diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 79e5c6d42f..59f5a741ef 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -98,9 +98,9 @@
 
 #include <machine/limits.h>
 
-extern int tcp_sosnd_agglim;
-extern int tcp_sosnd_async;
-extern int udp_sosnd_async;
+extern int tcp_sosend_agglim;
+extern int tcp_sosend_async;
+extern int udp_sosend_async;
 
 #ifdef INET
 static int	 do_setopt_accept_filter(struct socket *so, struct sockopt *sopt);
@@ -944,7 +944,7 @@ restart:
 	if (flags & MSG_DONTROUTE)
 		pru_flags |= PRUS_DONTROUTE;
 
-	if (udp_sosnd_async && (flags & MSG_SYNC) == 0) {
+	if (udp_sosend_async && (flags & MSG_SYNC) == 0) {
 		so_pru_send_async(so, pru_flags, top, addr, NULL, td);
 		error = 0;
 	} else {
@@ -1077,9 +1077,9 @@ restart:
 			if (resid == 0)
 				break;
 			++cnt;
-		    } while (space > 0 && cnt < tcp_sosnd_agglim);
+		    } while (space > 0 && cnt < tcp_sosend_agglim);
 
-		    if (tcp_sosnd_async)
+		    if (tcp_sosend_async)
 			    async = 1;
 
 		    if (flags & MSG_OOB) {
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 3ca0cf368c..84b20bf22d 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -220,13 +220,13 @@ int tcp_autorcvbuf_max = 2*1024*1024;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, recvbuf_max, CTLFLAG_RW,
     &tcp_autorcvbuf_max, 0, "Max size of automatic receive buffer");
 
-int tcp_sosnd_agglim = 2;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, sosnd_agglim, CTLFLAG_RW,
-    &tcp_sosnd_agglim, 0, "TCP sosend mbuf aggregation limit");
+int tcp_sosend_agglim = 2;
+SYSCTL_INT(_net_inet_tcp, OID_AUTO, sosend_agglim, CTLFLAG_RW,
+    &tcp_sosend_agglim, 0, "TCP sosend mbuf aggregation limit");
 
-int tcp_sosnd_async = 1;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, sosnd_async, CTLFLAG_RW,
-    &tcp_sosnd_async, 0, "TCP asynchronized pru_send");
+int tcp_sosend_async = 1;
+SYSCTL_INT(_net_inet_tcp, OID_AUTO, sosend_async, CTLFLAG_RW,
+    &tcp_sosend_async, 0, "TCP asynchronized pru_send");
 
 static void	 tcp_dooptions(struct tcpopt *, u_char *, int, boolean_t);
 static void	 tcp_pulloutofband(struct socket *,
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 24edc0929a..bd8728a290 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -145,9 +145,9 @@ static int	strict_mcast_mship = 1;
 SYSCTL_INT(_net_inet_udp, OID_AUTO, strict_mcast_mship, CTLFLAG_RW,
 	&strict_mcast_mship, 0, "Only send multicast to member sockets");
 
-int	udp_sosnd_async = 1;
-SYSCTL_INT(_net_inet_udp, OID_AUTO, sosnd_async, CTLFLAG_RW,
-	&udp_sosnd_async, 0, "UDP asynchronized pru_send");
+int	udp_sosend_async = 1;
+SYSCTL_INT(_net_inet_udp, OID_AUTO, sosend_async, CTLFLAG_RW,
+	&udp_sosend_async, 0, "UDP asynchronized pru_send");
 
 struct	inpcbinfo udbinfo;