diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-04-21 15:26:56 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-04-21 15:26:56 -0700 |
| commit | e2bca7c76a79b68506bfc3699beb74c0d41fe230 (patch) | |
| tree | 1b0269083de5ccc61a96b615ef271098df8e1b6a /include/linux/socket.h | |
| parent | b3c7740a120c8a7775cb63b4d094466da5c01692 (diff) | |
| parent | d54a45e2533ef33678dc340298b022a289d2b3e3 (diff) | |
Merge branch 'for_2.6.34rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 7b3aae2052a6..354cc5617f8b 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -255,6 +255,7 @@ struct ucred { #define MSG_ERRQUEUE 0x2000 /* Fetch message from error queue */ #define MSG_NOSIGNAL 0x4000 /* Do not generate SIGPIPE */ #define MSG_MORE 0x8000 /* Sender will send more */ +#define MSG_WAITFORONE 0x10000 /* recvmmsg(): block until 1+ packets avail */ #define MSG_EOF MSG_FIN |