From: "Wu, Bryan" Signed-off-by: Bryan Wu Signed-off-by: Andrew Morton --- include/asm-blackfin/socket.h | 11 ++++++----- include/asm-blackfin/sockios.h | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff -puN include/asm-blackfin/socket.h~blackfin-arch-add-scm_timestampns-and-siocgstampns-to include/asm-blackfin/socket.h --- a/include/asm-blackfin/socket.h~blackfin-arch-add-scm_timestampns-and-siocgstampns-to +++ a/include/asm-blackfin/socket.h @@ -38,15 +38,16 @@ #define SO_BINDTODEVICE 25 /* Socket filtering */ -#define SO_ATTACH_FILTER 26 -#define SO_DETACH_FILTER 27 +#define SO_ATTACH_FILTER 26 +#define SO_DETACH_FILTER 27 -#define SO_PEERNAME 28 +#define SO_PEERNAME 28 #define SO_TIMESTAMP 29 #define SCM_TIMESTAMP SO_TIMESTAMP #define SO_ACCEPTCONN 30 -#define SO_PEERSEC 31 +#define SO_PEERSEC 31 #define SO_PASSSEC 34 - +#define SO_TIMESTAMPNS 35 +#define SCM_TIMESTAMPNS SO_TIMESTAMPNS #endif /* _ASM_SOCKET_H */ diff -puN include/asm-blackfin/sockios.h~blackfin-arch-add-scm_timestampns-and-siocgstampns-to include/asm-blackfin/sockios.h --- a/include/asm-blackfin/sockios.h~blackfin-arch-add-scm_timestampns-and-siocgstampns-to +++ a/include/asm-blackfin/sockios.h @@ -7,6 +7,7 @@ #define FIOGETOWN 0x8903 #define SIOCGPGRP 0x8904 #define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906 /* Get stamp */ +#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ +#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ #endif /* __ARCH_BFIN_SOCKIOS__ */ _