• S
    sparc: Merge asm-sparc{,64}/socket.h · c8b8be54
    Sam Ravnborg 提交于
    :$ diff -u include/asm-sparc/socket.h include/asm-sparc64/socket.h
    :-- include/asm-sparc/socket.h	2008-06-13 06:46:39.000000000 +0200
    :++ include/asm-sparc64/socket.h	2008-06-13 06:46:39.000000000 +0200
    :@@ -48,11 +48,10 @@
    : #define SO_TIMESTAMPNS		0x0021
    : #define SCM_TIMESTAMPNS		SO_TIMESTAMPNS
    :
    :-#define SO_MARK			0x0022
    :-
    : /* Security levels - as per NRL IPv6 - don't actually do anything */
    : #define SO_SECURITY_AUTHENTICATION		0x5001
    : #define SO_SECURITY_ENCRYPTION_TRANSPORT	0x5002
    : #define SO_SECURITY_ENCRYPTION_NETWORK		0x5004
    :
    :+#define SO_MARK			0x0022
    : #endif /* _ASM_SOCKET_H */
    Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
    c8b8be54
socket.h 30 字节