diff options
| -rw-r--r-- | usr/src/man/man3ext/sendfile.3ext | 11 | ||||
| -rw-r--r-- | usr/src/man/man3ext/sendfilev.3ext | 15 | ||||
| -rw-r--r-- | usr/src/uts/common/io/myri10ge/drv/myri10ge.c | 15 | ||||
| -rw-r--r-- | usr/src/uts/common/io/myri10ge/drv/myri10ge_lro.c | 9 |
4 files changed, 13 insertions, 37 deletions
diff --git a/usr/src/man/man3ext/sendfile.3ext b/usr/src/man/man3ext/sendfile.3ext index 083c3e8398..ade1b0dfeb 100644 --- a/usr/src/man/man3ext/sendfile.3ext +++ b/usr/src/man/man3ext/sendfile.3ext @@ -3,7 +3,7 @@ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH SENDFILE 3EXT "May 31, 2006" +.TH SENDFILE 3EXT "Nov 3, 2017" .SH NAME sendfile \- send files over sockets or copy files to files .SH SYNOPSIS @@ -16,7 +16,6 @@ sendfile \- send files over sockets or copy files to files .fi .SH DESCRIPTION -.sp .LP The \fBsendfile()\fR function copies data from \fIin_fd\fR to \fIout_fd\fR starting at offset \fIoff\fR and of length \fIlen\fR bytes. The \fIin_fd\fR @@ -35,14 +34,12 @@ current file pointer of \fIin_fd\fR, but does modify the file pointer for The \fBsendfile()\fR function can also be used to send buffers by pointing \fIin_fd\fR to \fBSFV_FD_SELF\fR. .SH RETURN VALUES -.sp .LP Upon successful completion, \fBsendfile()\fR returns the total number of bytes written to \fIout_fd\fR and also updates the offset to point to the byte that follows the last byte read. Otherwise, it returns \fB-1\fR, and \fBerrno\fR is set to indicate the error. .SH ERRORS -.sp .LP The \fBsendfile()\fR function will fail if: .sp @@ -122,6 +119,9 @@ The socket type is not supported. .ad .RS 16n The \fIout_fd\fR argument is no longer connected to the peer endpoint. +The \fBSIGPIPE\fR signal is generated to the calling thread. +The process dies unless special provisions were taken to catch or ignore +the signal. .RE .sp @@ -134,7 +134,6 @@ A signal was caught during the write operation and no data was transferred. .RE .SH USAGE -.sp .LP The \fBsendfile()\fR function has a transitional interface for 64-bit file offsets. See \fBlf64\fR(5). @@ -244,7 +243,6 @@ while (len > 0) { .in -2 .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -262,7 +260,6 @@ MT-Level MT-Safe .TE .SH SEE ALSO -.sp .LP \fBopen\fR(2), \fBlibsendfile\fR(3LIB), \fBsendfilev\fR(3EXT), \fBsocket\fR(3SOCKET), \fBattributes\fR(5), \fBlf64\fR(5) diff --git a/usr/src/man/man3ext/sendfilev.3ext b/usr/src/man/man3ext/sendfilev.3ext index fe2707bc85..5ca76f6941 100644 --- a/usr/src/man/man3ext/sendfilev.3ext +++ b/usr/src/man/man3ext/sendfilev.3ext @@ -3,7 +3,7 @@ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH SENDFILEV 3EXT "Feb 25, 2009" +.TH SENDFILEV 3EXT "Nov 3, 2017" .SH NAME sendfilev \- send a file .SH SYNOPSIS @@ -17,7 +17,6 @@ sendfilev \- send a file .fi .SH PARAMETERS -.sp .LP The \fBsendfilev()\fR function supports the following parameters: .sp @@ -38,7 +37,7 @@ For \fBAF_NCA\fR, the protocol type should be zero. .ad .RS 11n An array of \fBSENDFILEVEC_T\fR, as defined in the \fBsendfilevec\fR structure -above. +below. .RE .sp @@ -60,7 +59,6 @@ The total number of bytes written to \fBout_fd\fR. .RE .SH DESCRIPTION -.sp .LP The \fBsendfilev()\fR function attempts to write data from the \fIsfvcnt\fR buffers specified by the members of \fIvec\fR array: \fBvec[0], vec[1], ... , @@ -110,7 +108,6 @@ To send data directly from the address space of the process, set \fBsfv_fd\fR to \fBSFV_FD_SELF\fR. \fBsfv_off\fR should point to the data, with \fBsfv_len\fR containing the length of the buffer. .SH RETURN VALUES -.sp .LP Upon successful completion, the \fBsendfilev()\fR function returns total number of bytes written to \fBout_fd\fR. Otherwise, it returns \fB-1\fR, and @@ -118,7 +115,6 @@ of bytes written to \fBout_fd\fR. Otherwise, it returns \fB-1\fR, and the amount of data successfuly transferred, which can be used to discover the error vector. .SH ERRORS -.sp .ne 2 .na \fB\fBEACCES\fR\fR @@ -209,6 +205,9 @@ An I/O error occurred while accessing the file system. .ad .RS 16n The \fIfildes\fR argument is a socket that has been shut down for writing. +The \fBSIGPIPE\fR signal is generated to the calling thread. +The process dies unless special provisions were taken to catch or ignore +the signal. .RE .sp @@ -221,12 +220,10 @@ The socket type is not supported. .RE .SH USAGE -.sp .LP The \fBsendfilev()\fR function has a transitional interface for 64-bit file offsets. See \fBlf64\fR(5). .SH EXAMPLES -.sp .LP The following example sends 2 vectors, one of HEADER data and a file of length 100 over \fBsockfd\fR. \fBsockfd\fR is in a connected state, that is, @@ -265,7 +262,6 @@ main (int argc, char *argv[]){ .in -2 .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -283,7 +279,6 @@ MT-Level MT-Safe .TE .SH SEE ALSO -.sp .LP \fBopen\fR(2), \fBwritev\fR(2), \fBlibsendfile\fR(3LIB), \fBsendfile\fR(3EXT), \fBsocket\fR(3SOCKET), \fBattributes\fR(5) diff --git a/usr/src/uts/common/io/myri10ge/drv/myri10ge.c b/usr/src/uts/common/io/myri10ge/drv/myri10ge.c index 256471ad47..d706e3ab70 100644 --- a/usr/src/uts/common/io/myri10ge/drv/myri10ge.c +++ b/usr/src/uts/common/io/myri10ge/drv/myri10ge.c @@ -34,11 +34,6 @@ * Copyright (c) 2016 by Delphix. All rights reserved. */ -#ifndef lint -static const char __idstring[] = - "@(#)$Id: myri10ge.c,v 1.186 2009-06-29 13:47:22 gallatin Exp $"; -#endif - #define MXGEFW_NDIS #include "myri10ge_var.h" #include "rss_eth_z8e.h" @@ -1210,7 +1205,7 @@ abort: int myri10ge_send_cmd(struct myri10ge_priv *mgp, uint32_t cmd, - myri10ge_cmd_t *data) + myri10ge_cmd_t *data) { mcp_cmd_t *buf; char buf_bytes[sizeof (*buf) + 8]; @@ -5005,7 +5000,6 @@ myri10ge_watchdog(void *arg) /*ARGSUSED*/ static int myri10ge_get_coalesce(queue_t *q, mblk_t *mp, caddr_t cp, cred_t *credp) - { struct myri10ge_priv *mgp = (struct myri10ge_priv *)(void *)cp; (void) mi_mpprintf(mp, "%d", mgp->intr_coal_delay); @@ -5016,7 +5010,6 @@ myri10ge_get_coalesce(queue_t *q, mblk_t *mp, caddr_t cp, cred_t *credp) static int myri10ge_set_coalesce(queue_t *q, mblk_t *mp, char *value, caddr_t cp, cred_t *credp) - { struct myri10ge_priv *mgp = (struct myri10ge_priv *)(void *)cp; char *end; @@ -5036,7 +5029,6 @@ myri10ge_set_coalesce(queue_t *q, mblk_t *mp, char *value, /*ARGSUSED*/ static int myri10ge_get_pauseparam(queue_t *q, mblk_t *mp, caddr_t cp, cred_t *credp) - { struct myri10ge_priv *mgp = (struct myri10ge_priv *)(void *)cp; (void) mi_mpprintf(mp, "%d", mgp->pause); @@ -5046,8 +5038,7 @@ myri10ge_get_pauseparam(queue_t *q, mblk_t *mp, caddr_t cp, cred_t *credp) /*ARGSUSED*/ static int myri10ge_set_pauseparam(queue_t *q, mblk_t *mp, char *value, - caddr_t cp, cred_t *credp) - + caddr_t cp, cred_t *credp) { struct myri10ge_priv *mgp = (struct myri10ge_priv *)(void *)cp; char *end; @@ -5070,7 +5061,6 @@ myri10ge_set_pauseparam(queue_t *q, mblk_t *mp, char *value, /*ARGSUSED*/ static int myri10ge_get_int(queue_t *q, mblk_t *mp, caddr_t cp, cred_t *credp) - { (void) mi_mpprintf(mp, "%d", *(int *)(void *)cp); return (0); @@ -5080,7 +5070,6 @@ myri10ge_get_int(queue_t *q, mblk_t *mp, caddr_t cp, cred_t *credp) static int myri10ge_set_int(queue_t *q, mblk_t *mp, char *value, caddr_t cp, cred_t *credp) - { char *end; size_t new_value; diff --git a/usr/src/uts/common/io/myri10ge/drv/myri10ge_lro.c b/usr/src/uts/common/io/myri10ge/drv/myri10ge_lro.c index ba2177e0fe..2c98e7d690 100644 --- a/usr/src/uts/common/io/myri10ge/drv/myri10ge_lro.c +++ b/usr/src/uts/common/io/myri10ge/drv/myri10ge_lro.c @@ -24,11 +24,6 @@ * Use is subject to license terms. */ -#ifndef lint -static const char __idstring[] = - "@(#)$Id: myri10ge_lro.c,v 1.7 2009-06-29 13:47:22 gallatin Exp $"; -#endif - #include "myri10ge_var.h" #define IP_OFFMASK 0x1fff @@ -73,7 +68,7 @@ myri10ge_in_pseudo(unsigned int a, unsigned int b, void myri10ge_lro_flush(struct myri10ge_slice_state *ss, struct lro_entry *lro, - struct myri10ge_mblk_list *mbl) + struct myri10ge_mblk_list *mbl) { struct ip *ip; struct tcphdr *tcp; @@ -134,7 +129,7 @@ myri10ge_lro_flush(struct myri10ge_slice_state *ss, struct lro_entry *lro, int myri10ge_lro_rx(struct myri10ge_slice_state *ss, mblk_t *m_head, - uint32_t csum, struct myri10ge_mblk_list *mbl) + uint32_t csum, struct myri10ge_mblk_list *mbl) { struct ether_header *eh; struct ip *ip; |