summaryrefslogtreecommitdiffstats
path: root/include/linux/socket.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-03-16 15:52:15 -0700
committerDavid S. Miller <davem@davemloft.net>2021-03-16 15:52:15 -0700
commit01035bcc0f9195a19a76c8a006b3c520428acb61 (patch)
treecd57a563daa30393334ec7d5ae4308c99f52d516 /include/linux/socket.h
parent35db476a29854d9afdb01482ef8cc17863a8e231 (diff)
downloadlinux-stable-01035bcc0f9195a19a76c8a006b3c520428acb61.tar.gz
linux-stable-01035bcc0f9195a19a76c8a006b3c520428acb61.tar.bz2
linux-stable-01035bcc0f9195a19a76c8a006b3c520428acb61.zip
Revert "net: socket: use BIT() for MSG_*"
This reverts commit 0bb3262c0248d44aea3be31076f44beb82a7b120. Breaks things on mips64/qemu Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/socket.h')
-rw-r--r--include/linux/socket.h71
1 files changed, 34 insertions, 37 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h
index e88859f38cd0..385894b4a8bb 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -283,45 +283,42 @@ struct ucred {
Added those for 1003.1g not all are supported yet
*/
-#define MSG_OOB BIT(0)
-#define MSG_PEEK BIT(1)
-#define MSG_DONTROUTE BIT(2)
-#define MSG_TRYHARD BIT(2) /* Synonym for MSG_DONTROUTE for DECnet */
-#define MSG_CTRUNC BIT(3)
-#define MSG_PROBE BIT(4) /* Do not send. Only probe path f.e. for MTU */
-#define MSG_TRUNC BIT(5)
-#define MSG_DONTWAIT BIT(6) /* Nonblocking io */
-#define MSG_EOR BIT(7) /* End of record */
-#define MSG_WAITALL BIT(8) /* Wait for a full request */
-#define MSG_FIN BIT(9)
-#define MSG_SYN BIT(10)
-#define MSG_CONFIRM BIT(11) /* Confirm path validity */
-#define MSG_RST BIT(12)
-#define MSG_ERRQUEUE BIT(13) /* Fetch message from error queue */
-#define MSG_NOSIGNAL BIT(14) /* Do not generate SIGPIPE */
-#define MSG_MORE BIT(15) /* Sender will send more */
-#define MSG_WAITFORONE BIT(16) /* recvmmsg(): block until 1+ packets avail */
-#define MSG_SENDPAGE_NOPOLICY BIT(16) /* sendpage() internal : do no apply policy */
-#define MSG_SENDPAGE_NOTLAST BIT(17) /* sendpage() internal : not the last page */
-#define MSG_BATCH BIT(18) /* sendmmsg(): more messages coming */
-#define MSG_EOF MSG_FIN
-#define MSG_NO_SHARED_FRAGS BIT(19) /* sendpage() internal : page frags
- * are not shared
- */
-#define MSG_SENDPAGE_DECRYPTED BIT(20) /* sendpage() internal : page may carry
- * plain text and require encryption
- */
-
-#define MSG_ZEROCOPY BIT(26) /* Use user data in kernel path */
-#define MSG_FASTOPEN BIT(29) /* Send data in TCP SYN */
-#define MSG_CMSG_CLOEXEC BIT(30) /* Set close_on_exec for file
- * descriptor received through
- * SCM_RIGHTS
- */
+#define MSG_OOB 1
+#define MSG_PEEK 2
+#define MSG_DONTROUTE 4
+#define MSG_TRYHARD 4 /* Synonym for MSG_DONTROUTE for DECnet */
+#define MSG_CTRUNC 8
+#define MSG_PROBE 0x10 /* Do not send. Only probe path f.e. for MTU */
+#define MSG_TRUNC 0x20
+#define MSG_DONTWAIT 0x40 /* Nonblocking io */
+#define MSG_EOR 0x80 /* End of record */
+#define MSG_WAITALL 0x100 /* Wait for a full request */
+#define MSG_FIN 0x200
+#define MSG_SYN 0x400
+#define MSG_CONFIRM 0x800 /* Confirm path validity */
+#define MSG_RST 0x1000
+#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_SENDPAGE_NOPOLICY 0x10000 /* sendpage() internal : do no apply policy */
+#define MSG_SENDPAGE_NOTLAST 0x20000 /* sendpage() internal : not the last page */
+#define MSG_BATCH 0x40000 /* sendmmsg(): more messages coming */
+#define MSG_EOF MSG_FIN
+#define MSG_NO_SHARED_FRAGS 0x80000 /* sendpage() internal : page frags are not shared */
+#define MSG_SENDPAGE_DECRYPTED 0x100000 /* sendpage() internal : page may carry
+ * plain text and require encryption
+ */
+
+#define MSG_ZEROCOPY 0x4000000 /* Use user data in kernel path */
+#define MSG_FASTOPEN 0x20000000 /* Send data in TCP SYN */
+#define MSG_CMSG_CLOEXEC 0x40000000 /* Set close_on_exec for file
+ descriptor received through
+ SCM_RIGHTS */
#if defined(CONFIG_COMPAT)
-#define MSG_CMSG_COMPAT BIT(31) /* This message needs 32 bit fixups */
+#define MSG_CMSG_COMPAT 0x80000000 /* This message needs 32 bit fixups */
#else
-#define MSG_CMSG_COMPAT 0 /* We never have 32 bit fixups */
+#define MSG_CMSG_COMPAT 0 /* We never have 32 bit fixups */
#endif