diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-10-11 16:00:17 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-10-11 16:00:17 +0100 |
| commit | c00ed4fa5a593e8e48ded4fb5ad22ecf0348f01d (patch) | |
| tree | 909f29a065a94e61f2919a39f46a243c3f5c295b /usr/src/uts/common/sys/ksocket.h | |
| parent | d322ce9e5e9bb437d93bf09b5354eede23491de7 (diff) | |
| parent | ea3068a71489464a7cde899773f9ae3541209461 (diff) | |
| download | illumos-joyent-c00ed4fa5a593e8e48ded4fb5ad22ecf0348f01d.tar.gz | |
Merge branch 'master' of http://github.com/illumos/illumos-gate into gcc/upgrade
Conflicts:
usr/src/cmd/avs/dsw/iiadm.c
Diffstat (limited to 'usr/src/uts/common/sys/ksocket.h')
| -rw-r--r-- | usr/src/uts/common/sys/ksocket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/uts/common/sys/ksocket.h b/usr/src/uts/common/sys/ksocket.h index df15b12c08..dfe25eec76 100644 --- a/usr/src/uts/common/sys/ksocket.h +++ b/usr/src/uts/common/sys/ksocket.h @@ -19,6 +19,7 @@ * CDDL HEADER END */ /* + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -113,6 +114,7 @@ extern int ksocket_getpeername(ksocket_t, struct sockaddr *, socklen_t *, extern int ksocket_getsockname(ksocket_t, struct sockaddr *, socklen_t *, struct cred *); extern int ksocket_ioctl(ksocket_t, int, intptr_t, int *, struct cred *); +extern int ksocket_spoll(ksocket_t, int, short, short *, struct cred *); extern int ksocket_setcallbacks(ksocket_t, ksocket_callbacks_t *, void *, struct cred *); extern int ksocket_close(ksocket_t, struct cred *); |