diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /include/linux/socket.h | |
| parent | b4d562e3c3553ac58c7120555c4e4aefbb090a2a (diff) | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
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 960659bd8f78..032a19eb61b1 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h | |||
| @@ -257,6 +257,7 @@ struct ucred { | |||
| 257 | #define MSG_ERRQUEUE 0x2000 /* Fetch message from error queue */ | 257 | #define MSG_ERRQUEUE 0x2000 /* Fetch message from error queue */ |
| 258 | #define MSG_NOSIGNAL 0x4000 /* Do not generate SIGPIPE */ | 258 | #define MSG_NOSIGNAL 0x4000 /* Do not generate SIGPIPE */ |
| 259 | #define MSG_MORE 0x8000 /* Sender will send more */ | 259 | #define MSG_MORE 0x8000 /* Sender will send more */ |
| 260 | #define MSG_WAITFORONE 0x10000 /* recvmmsg(): block until 1+ packets avail */ | ||
| 260 | 261 | ||
| 261 | #define MSG_EOF MSG_FIN | 262 | #define MSG_EOF MSG_FIN |
| 262 | 263 | ||