[PATCH v2 1/2] socket.h: fix SO_* for mips

[PATCH v2 1/2] socket.h: fix SO_* for mips

[Roman Yeryomin]

Signed-off-by: Roman Yeryomin <roman@ubnt.com>
---
 arch/mips/bits/socket.h    | 3 +++
 arch/powerpc/bits/socket.h | 4 +++-
 include/sys/socket.h       | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/arch/mips/bits/socket.h b/arch/mips/bits/socket.h
index fe5bad9..22294f1 100644
--- a/arch/mips/bits/socket.h
+++ b/arch/mips/bits/socket.h
@@ -44,6 +44,9 @@ struct cmsghdr
 #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 4ed04d3..8531ec9 100644
--- a/arch/powerpc/bits/socket.h
+++ b/arch/powerpc/bits/socket.h
@@ -39,4 +39,6 @@ struct cmsghdr
 #define SO_SNDTIMEO     19
 #define SO_PASSCRED     20
 #define SO_PEERCRED     21
- 
+#define SO_ACCEPTCONN   30
+#define SO_PROTOCOL     38
+#define SO_DOMAIN       39
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 077fb3f..40de336 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -177,8 +177,11 @@ struct linger
 #define SO_SNDLOWAT     19
 #define SO_RCVTIMEO     20
 #define SO_SNDTIMEO     21
+#define SO_ACCEPTCONN   30
 #define SO_SNDBUFFORCE  32
 #define SO_RCVBUFFORCE  33
+#define SO_PROTOCOL     38
+#define SO_DOMAIN       39
 #endif
 
 #define SO_SECURITY_AUTHENTICATION              22
@@ -195,7 +198,6 @@ struct linger
 #define SO_TIMESTAMP            29
 #define SCM_TIMESTAMP           SO_TIMESTAMP
 
-#define SO_ACCEPTCONN           30
 #define SO_PEERSEC              31
 #define SO_PASSSEC              34
 #define SO_TIMESTAMPNS          35
@@ -203,8 +205,6 @@ struct linger
 #define SO_MARK                 36
 #define SO_TIMESTAMPING         37
 #define SCM_TIMESTAMPING        SO_TIMESTAMPING
-#define SO_PROTOCOL             38
-#define SO_DOMAIN               39
 #define SO_RXQ_OVFL             40
 #define SO_WIFI_STATUS          41
 #define SCM_WIFI_STATUS         SO_WIFI_STATUS
-- 
2.1.4

Re: [PATCH v2 1/2] socket.h: fix SO_* for mips

[Roman Yeryomin]

On Thu, Jul 2, 2015 at 12:28 PM, Roman Yeryomin <roman@ubnt.com> wrote:
> Signed-off-by: Roman Yeryomin <roman@ubnt.com>
> ---
>  arch/mips/bits/socket.h    | 3 +++
>  arch/powerpc/bits/socket.h | 4 +++-
>  include/sys/socket.h       | 6 +++---
>  3 files changed, 9 insertions(+), 4 deletions(-)

Any plans to commit this.
This unbreaks bluez which fails like this currently:

bluetoothd[970]: bt_io_get: getsockopt(SO_DOMAIN): Protocol not available (99)


Regards,
Roman

Re: [PATCH v2 1/2] socket.h: fix SO_* for mips

[Rich Felker]

On Fri, Jul 10, 2015 at 04:31:58PM +0300, Roman Yeryomin wrote:
> On Thu, Jul 2, 2015 at 12:28 PM, Roman Yeryomin <roman@ubnt.com> wrote:
> > Signed-off-by: Roman Yeryomin <roman@ubnt.com>
> > ---
> >  arch/mips/bits/socket.h    | 3 +++
> >  arch/powerpc/bits/socket.h | 4 +++-
> >  include/sys/socket.h       | 6 +++---
> >  3 files changed, 9 insertions(+), 4 deletions(-)
> 
> Any plans to commit this.
> This unbreaks bluez which fails like this currently:
> 
> bluetoothd[970]: bt_io_get: getsockopt(SO_DOMAIN): Protocol not available (99)

Sorry! Will commit before release.

Rich

Re: [PATCH v2 1/2] socket.h: fix SO_* for mips

[Rich Felker]

On Sun, Jul 12, 2015 at 04:25:19PM -0400, Rich Felker wrote:
> On Fri, Jul 10, 2015 at 04:31:58PM +0300, Roman Yeryomin wrote:
> > On Thu, Jul 2, 2015 at 12:28 PM, Roman Yeryomin <roman@ubnt.com> wrote:
> > > Signed-off-by: Roman Yeryomin <roman@ubnt.com>
> > > ---
> > >  arch/mips/bits/socket.h    | 3 +++
> > >  arch/powerpc/bits/socket.h | 4 +++-
> > >  include/sys/socket.h       | 6 +++---
> > >  3 files changed, 9 insertions(+), 4 deletions(-)
> > 
> > Any plans to commit this.
> > This unbreaks bluez which fails like this currently:
> > 
> > bluetoothd[970]: bt_io_get: getsockopt(SO_DOMAIN): Protocol not available (99)
> 
> Sorry! Will commit before release.

Committed both this and the clean-up patch. Thanks!

Rich