Page MenuHomeFreeBSD
Files F142350705

D50190.id.diff
No OneTemporary
Actions

D50190.id.diff
View Options

diff --git a/sys/dev/hyperv/hvsock/hv_sock.c b/sys/dev/hyperv/hvsock/hv_sock.c
--- a/sys/dev/hyperv/hvsock/hv_sock.c
+++ b/sys/dev/hyperv/hvsock/hv_sock.c
@@ -1461,7 +1461,7 @@
}
/*
- * Create a new socket. This will call pru_attach to complete
+ * Create a new socket. This will call pr_attach() to complete
* the socket initialization and put the new socket onto
* listening socket's sol_incomp list, waiting to be promoted
* to sol_comp list.
diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c
--- a/sys/kern/kern_sendfile.c
+++ b/sys/kern/kern_sendfile.c
@@ -83,7 +83,7 @@
* Every I/O completion calls sendfile_iodone(), which decrements the 'nios',
* and the syscall also calls sendfile_iodone() after allocating all mbufs,
* linking them and sending to socket. Whoever reaches zero 'nios' is
- * responsible to * call pru_ready on the socket, to notify it of readyness
+ * responsible to call pr_ready() on the socket, to notify it of readyness
* of the data.
*/
struct sf_io {
@@ -353,7 +353,7 @@
* Either I/O operation failed, or we failed to allocate
* buffers, or we bailed out on first busy page, or we
* succeeded filling the request without any I/Os. Anyway,
- * pru_send hadn't been executed - nothing had been sent
+ * pr_send() hadn't been executed - nothing had been sent
* to the socket yet.
*/
MPASS((curthread->td_pflags & TDP_KTHREAD) == 0);
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -41,18 +41,18 @@
* sodealloc() tears down socket layer state for a socket, called only by
* sofree() and sonewconn(). Socket layer private.
*
- * pru_attach() associates protocol layer state with an allocated socket;
+ * pr_attach() associates protocol layer state with an allocated socket;
* called only once, may fail, aborting socket allocation. This is called
* from socreate() and sonewconn(). Socket layer private.
*
- * pru_detach() disassociates protocol layer state from an attached socket,
- * and will be called exactly once for sockets in which pru_attach() has
- * been successfully called. If pru_attach() returned an error,
- * pru_detach() will not be called. Socket layer private.
+ * pr_detach() disassociates protocol layer state from an attached socket,
+ * and will be called exactly once for sockets in which pr_attach() has
+ * been successfully called. If pr_attach() returned an error,
+ * pr_detach() will not be called. Socket layer private.
*
- * pru_abort() and pru_close() notify the protocol layer that the last
+ * pr_abort() and pr_close() notify the protocol layer that the last
* consumer of a socket is starting to tear down the socket, and that the
- * protocol should terminate the connection. Historically, pru_abort() also
+ * protocol should terminate the connection. Historically, pr_abort() also
* detached protocol state from the socket state, but this is no longer the
* case.
*
@@ -969,7 +969,7 @@
}
/*
* Auto-sizing of socket buffers is managed by the protocols and
- * the appropriate flags must be set in the pru_attach function.
+ * the appropriate flags must be set in the pr_attach() method.
*/
CURVNET_SET(so->so_vnet);
error = prp->pr_attach(so, proto, td);
@@ -1338,9 +1338,9 @@
__func__, head->so_pcb);
return (NULL);
}
- if ((*so->so_proto->pr_attach)(so, 0, NULL)) {
+ if (so->so_proto->pr_attach(so, 0, NULL)) {
sodealloc(so);
- log(LOG_DEBUG, "%s: pcb %p: pru_attach() failed\n",
+ log(LOG_DEBUG, "%s: pcb %p: pr_attach() failed\n",
__func__, head->so_pcb);
return (NULL);
}
@@ -3826,7 +3826,7 @@
CURVNET_SET(so->so_vnet);
error = 0;
if (sopt->sopt_level != SOL_SOCKET) {
- error = (*so->so_proto->pr_ctloutput)(so, sopt);
+ error = so->so_proto->pr_ctloutput(so, sopt);
} else {
switch (sopt->sopt_name) {
case SO_ACCEPTFILTER:
@@ -4037,7 +4037,7 @@
break;
}
if (error == 0)
- (void)(*so->so_proto->pr_ctloutput)(so, sopt);
+ (void)so->so_proto->pr_ctloutput(so, sopt);
}
bad:
CURVNET_RESTORE();
@@ -4087,7 +4087,7 @@
CURVNET_SET(so->so_vnet);
error = 0;
if (sopt->sopt_level != SOL_SOCKET) {
- error = (*so->so_proto->pr_ctloutput)(so, sopt);
+ error = so->so_proto->pr_ctloutput(so, sopt);
CURVNET_RESTORE();
return (error);
} else {
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -1984,7 +1984,7 @@
if (so->so_type != SOCK_SEQPACKET)
return (ESOCKTNOSUPPORT);
-#if 0 /* XXX sonewconn() calls "pru_attach" with proto == 0 */
+#if 0 /* XXX sonewconn() calls pr_attach() with proto == 0 */
if (proto != 0)
if (proto != BLUETOOTH_PROTO_L2CAP)
return (EPROTONOSUPPORT);
@@ -2055,7 +2055,7 @@
* In the second case we hold ng_btsocket_l2cap_sockets_mtx already.
* So we now need to distinguish between these cases. From reading
* /sys/kern/uipc_socket.c we can find out that sonewconn() calls
- * pru_attach with proto == 0 and td == NULL. For now use this fact
+ * pr_attach() with proto == 0 and td == NULL. For now use this fact
* to figure out if we were called from socket() or from sonewconn().
*/
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -384,7 +384,7 @@
if (so->so_type != SOCK_STREAM)
return (ESOCKTNOSUPPORT);
-#if 0 /* XXX sonewconn() calls "pru_attach" with proto == 0 */
+#if 0 /* XXX sonewconn() calls pr_attach() with proto == 0 */
if (proto != 0)
if (proto != BLUETOOTH_PROTO_RFCOMM)
return (EPROTONOSUPPORT);
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
@@ -1192,7 +1192,7 @@
if (so->so_type != SOCK_SEQPACKET)
return (ESOCKTNOSUPPORT);
-#if 0 /* XXX sonewconn() calls "pru_attach" with proto == 0 */
+#if 0 /* XXX sonewconn() calls pr_attach() with proto == 0 */
if (proto != 0)
if (proto != BLUETOOTH_PROTO_SCO)
return (EPROTONOSUPPORT);
@@ -1247,7 +1247,7 @@
* In the second case we hold ng_btsocket_sco_sockets_mtx already.
* So we now need to distinguish between these cases. From reading
* /sys/kern/uipc_socket2.c we can find out that sonewconn() calls
- * pru_attach with proto == 0 and td == NULL. For now use this fact
+ * pr_attach() with proto == 0 and td == NULL. For now use this fact
* to figure out if we were called from socket() or from sonewconn().
*/
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -146,7 +146,7 @@
}
/*
- * TCP attaches to socket via pru_attach(), reserving space,
+ * TCP attaches to socket via pr_attach(), reserving space,
* and an internet control block.
*/
static int
@@ -907,8 +907,8 @@
/*
* Do a send by putting data in output queue and updating urgent
* marker if URG set. Possibly send more data. Unlike the other
- * pru_*() routines, the mbuf chains are our responsibility. We
- * must either enqueue them or free them. The other pru_* routines
+ * pr_*() routines, the mbuf chains are our responsibility. We
+ * must either enqueue them or free them. The other pr_*() routines
* generally are caller-frees.
*/
static int
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -528,15 +528,6 @@
/* Minimum map entries limit value, if set */
#define TCP_MIN_MAP_ENTRIES_LIMIT 128
-/*
- * TODO: We yet need to brave plowing in
- * to tcp_input() and the pru_usrreq() block.
- * Right now these go to the old standards which
- * are somewhat ok, but in the long term may
- * need to be changed. If we do tackle tcp_input()
- * then we need to get rid of the tcp_do_segment()
- * function below.
- */
/* Flags for tcp functions */
#define TCP_FUNC_BEING_REMOVED 0x01 /* Can no longer be referenced */
#define TCP_FUNC_OUTPUT_CANDROP 0x02 /* tfb_tcp_output may ask tcp_drop */
diff --git a/sys/netinet/toecore.h b/sys/netinet/toecore.h
--- a/sys/netinet/toecore.h
+++ b/sys/netinet/toecore.h
@@ -66,7 +66,7 @@
void (*tod_input)(struct toedev *, struct tcpcb *, struct mbuf *);
/*
- * This is called by the kernel during pru_rcvd for an offloaded TCP
+ * This is called by the kernel during pr_rcvd() for an offloaded TCP
* connection and provides an opportunity for the TOE driver to manage
* its rx window and credits.
*/
diff --git a/sys/netinet/toecore.c b/sys/netinet/toecore.c
--- a/sys/netinet/toecore.c
+++ b/sys/netinet/toecore.c
@@ -525,7 +525,7 @@
/*
* Temporary failure during offload, take this PCB back.
* Detach from the TOE driver and do the rest of what
- * TCP's pru_connect would have done if the connection
+ * TCP's pr_connect() would have done if the connection
* wasn't offloaded.
*/

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 19, 10:14 PM (4 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27737237
Default Alt Text
D50190.id.diff (9 KB)

Event Timeline