diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-04-15 23:44:21 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-04-15 23:56:06 +0000 |
| commit | d74e1c52fb42c9e48fc33574a1cc964b27954bc6 (patch) | |
| tree | af02d286b8bc0842f7a7b809591219f7124a15d9 /usr/src/uts/common/sys/socket.h | |
| parent | 484797449e047bc3b1f53f9af574cfd68d8e24c8 (diff) | |
| parent | 8c430e5901323dc4ac1bd69a6bbf0bc356f02ae5 (diff) | |
| download | illumos-joyent-d74e1c52fb42c9e48fc33574a1cc964b27954bc6.tar.gz | |
[illumos-gate merge]
commit 8c430e5901323dc4ac1bd69a6bbf0bc356f02ae5
3708 Fast reboot support in ixgbe
commit 187670a04e7557914566fc449b4d3af38caea282
3666 Implement SOCK_CLOEXEC flag to socket()
commit f971a3462face662ae8ef220a18a98354d625d54
3673 core dumping is abysmally slow
3671 left behind enemy lines, agent LWP can go rogue
3670 add visibility into agent LWP's spymaster
commit abc79d9dd51e98eafb6fc25b4a0b4f66bef40b00
3679 prtconf should print out PCI database information
3680 Want a library to allow programatic access to the pci database
Conflicts:
usr/src/uts/common/fs/proc/prvnops.c
usr/src/uts/common/fs/proc/prcontrol.c
usr/src/man/man1m/prtconf.1m
usr/src/lib/Makefile
usr/src/cmd/ptools/pflags/pflags.c
Manifests:
usr/src/pkg/manifests/system-library.mf [already present]
Diffstat (limited to 'usr/src/uts/common/sys/socket.h')
| -rw-r--r-- | usr/src/uts/common/sys/socket.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr/src/uts/common/sys/socket.h b/usr/src/uts/common/sys/socket.h index 5d4648234c..0b91740d3a 100644 --- a/usr/src/uts/common/sys/socket.h +++ b/usr/src/uts/common/sys/socket.h @@ -35,6 +35,8 @@ * contributors. */ +/* Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. */ + #ifndef _SYS_SOCKET_H #define _SYS_SOCKET_H @@ -101,6 +103,12 @@ typedef void *_RESTRICT_KYWD Psocklen_t; #endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */ #define SOCK_RDM 5 /* reliably-delivered message */ #define SOCK_SEQPACKET 6 /* sequenced packet stream */ +#define SOCK_TYPE_MASK 0xffff /* type reside in these bits only */ + +/* + * Flags for socket() + */ +#define SOCK_CLOEXEC 0x80000 /* like open(2) O_CLOEXEC for socket */ /* * Option flags per-socket. |