Eric, please look at whole files you are editing :) I'm sure
there is probably another case like this or two in the
other platform socket ioctl allocations you made.
Thanks.
commit 9415518744729743b017da2e08a71c5bb0d94108
Author: David S. Miller <[EMAIL PROTECTED]>
Date: Fri Mar 9 16:22:52 2007 -0800
[NET]: Fix SO_TIMESTAMPNS values allocated to sparc.
They confliced with SO_BROADCAST which already uses the
value 0x0020.
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
diff --git a/include/asm-sparc/socket.h b/include/asm-sparc/socket.h
index d77768e..7c14239 100644
--- a/include/asm-sparc/socket.h
+++ b/include/asm-sparc/socket.h
@@ -49,7 +49,7 @@
#define SO_PEERSEC 0x001e
#define SO_PASSSEC 0x001f
-#define SO_TIMESTAMPNS 0x0020
+#define SO_TIMESTAMPNS 0x0021
#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
/* Security levels - as per NRL IPv6 - don't actually do anything */
diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h
index 1bd9f52..986441d 100644
--- a/include/asm-sparc64/socket.h
+++ b/include/asm-sparc64/socket.h
@@ -49,7 +49,7 @@
#define SO_PEERSEC 0x001e
#define SO_PASSSEC 0x001f
-#define SO_TIMESTAMPNS 0x0020
+#define SO_TIMESTAMPNS 0x0021
#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
/* Security levels - as per NRL IPv6 - don't actually do anything */
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
