[<prev] [next>] [day] [month] [year] [list]
Date: Thu, 2 Jul 2015 12:29:00 +0300
From: Roman Yeryomin <roman@...t.com>
To: musl <musl@...ts.openwall.com>
Subject: [PATCH v2 2/2] socket.h: cleanup/reorder mips and powerpc bits/socket.h
...to be somewhat consistent and easily comparable with asm/socket.h
Signed-off-by: Roman Yeryomin <roman@...t.com>
---
arch/mips/bits/socket.h | 34 ++++++++++++++++++----------------
arch/powerpc/bits/socket.h | 4 ++--
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/arch/mips/bits/socket.h b/arch/mips/bits/socket.h
index 22294f1..cc72dcf 100644
--- a/arch/mips/bits/socket.h
+++ b/arch/mips/bits/socket.h
@@ -22,31 +22,33 @@ struct cmsghdr
#define SOL_SOCKET 65535
#define SO_DEBUG 1
-#define SO_REUSEADDR 4
-#define SO_TYPE 0x1008
-#define SO_ERROR 0x1007
-#define SO_DONTROUTE 16
-#define SO_BROADCAST 32
+
+#define SO_REUSEADDR 0x0004
+#define SO_KEEPALIVE 0x0008
+#define SO_DONTROUTE 0x0010
+#define SO_BROADCAST 0x0020
+#define SO_LINGER 0x0080
+#define SO_OOBINLINE 0x0100
+#define SO_REUSEPORT 0x0200
#define SO_SNDBUF 0x1001
#define SO_RCVBUF 0x1002
-#define SO_KEEPALIVE 8
-#define SO_OOBINLINE 256
+#define SO_SNDLOWAT 0x1003
+#define SO_RCVLOWAT 0x1004
+#define SO_RCVTIMEO 0x1006
+#define SO_SNDTIMEO 0x1005
+#define SO_ERROR 0x1007
+#define SO_TYPE 0x1008
+#define SO_ACCEPTCONN 0x1009
+#define SO_PROTOCOL 0x1028
+#define SO_DOMAIN 0x1029
+
#define SO_NO_CHECK 11
#define SO_PRIORITY 12
-#define SO_LINGER 128
#define SO_BSDCOMPAT 14
-#define SO_REUSEPORT 512
#define SO_PASSCRED 17
#define SO_PEERCRED 18
-#define SO_RCVLOWAT 0x1004
-#define SO_SNDLOWAT 0x1003
-#define SO_RCVTIMEO 0x1006
-#define SO_SNDTIMEO 0x1005
#define SO_SNDBUFFORCE 31
#define SO_RCVBUFFORCE 33
-#define SO_ACCEPTCONN 0x1009
-#define SO_PROTOCOL 0x1028
-#define SO_DOMAIN 0x1029
#define SOCK_NONBLOCK 0200
#define SOCK_CLOEXEC 02000000
diff --git a/arch/powerpc/bits/socket.h b/arch/powerpc/bits/socket.h
index 8531ec9..1808791 100644
--- a/arch/powerpc/bits/socket.h
+++ b/arch/powerpc/bits/socket.h
@@ -24,8 +24,6 @@ struct cmsghdr
#define SO_BROADCAST 6
#define SO_SNDBUF 7
#define SO_RCVBUF 8
-#define SO_SNDBUFFORCE 32
-#define SO_RCVBUFFORCE 33
#define SO_KEEPALIVE 9
#define SO_OOBINLINE 10
#define SO_NO_CHECK 11
@@ -40,5 +38,7 @@ struct cmsghdr
#define SO_PASSCRED 20
#define SO_PEERCRED 21
#define SO_ACCEPTCONN 30
+#define SO_SNDBUFFORCE 32
+#define SO_RCVBUFFORCE 33
#define SO_PROTOCOL 38
#define SO_DOMAIN 39
--
2.1.4
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
