commit c4aec5f6755d61b033c1b49970dc4f39e11f3882
author Avery Pennarun <apenwarr@gmail.com> Wed Sep 17 23:56:18 2014 -0400
committer Avery Pennarun <apenwarr@gmail.com> Thu Sep 18 00:02:37 2014 -0400
tree 4c2344f43adc44332adacfe6d95fed46017d475a
parent 62228027535c7771fef56dbfc9353d61da92f915

SO_RXQ_ALLOC: use a non-sequential sockopt number to avoid conflicts.

It's unsafe to just use the next sockopt in the sequence, because kernel
updates from upstream are likely to use that one.  In fact, the upcoming
cherry-pick does exactly that.

Change-Id: I95783b1e0878e0bc345d653dc1247a275c1a5675

arch/arm/include/asm/socket.h

diff --git a/arch/arm/include/asm/socket.h b/arch/arm/include/asm/socket.h
index 23061f7..3ff6501 100644
--- a/arch/arm/include/asm/socket.h
+++ b/arch/arm/include/asm/socket.h
@@ -61,6 +61,6 @@
 #define SO_DOMAIN		39
 
 #define SO_RXQ_OVFL             40
-#define SO_RXQ_ALLOC		41
+#define SO_RXQ_ALLOC		101  /* non-upstreamed sockopt */
 
 #endif /* _ASM_SOCKET_H */

include/asm-generic/socket.h

diff --git a/include/asm-generic/socket.h b/include/asm-generic/socket.h
index 56d2b13..8e7c2f7 100644
--- a/include/asm-generic/socket.h
+++ b/include/asm-generic/socket.h
@@ -64,5 +64,6 @@
 #define SO_DOMAIN		39
 
 #define SO_RXQ_OVFL             40
-#define SO_RXQ_ALLOC		41
+#define SO_RXQ_ALLOC		101  /* non-upstreamed sockopt */
+
 #endif /* __ASM_GENERIC_SOCKET_H */