arch: Use asm-generic/socket.h when possible

+1

arch/ia64/include/uapi/asm/Kbuild

··· 2 2 3 3 generated-y += unistd_64.h 4 4 generic-y += kvm_para.h 5 + generic-y += socket.h

-122

arch/ia64/include/uapi/asm/socket.h

··· 1 - /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 2 - #ifndef _ASM_IA64_SOCKET_H 3 - #define _ASM_IA64_SOCKET_H 4 - 5 - /* 6 - * Socket related defines. 7 - * 8 - * Based on <asm-i386/socket.h>. 9 - * 10 - * Modified 1998-2000 11 - * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co 12 - */ 13 - 14 - #include <asm/sockios.h> 15 - 16 - /* For setsockopt(2) */ 17 - #define SOL_SOCKET 1 18 - 19 - #define SO_DEBUG 1 20 - #define SO_REUSEADDR 2 21 - #define SO_TYPE 3 22 - #define SO_ERROR 4 23 - #define SO_DONTROUTE 5 24 - #define SO_BROADCAST 6 25 - #define SO_SNDBUF 7 26 - #define SO_RCVBUF 8 27 - #define SO_SNDBUFFORCE 32 28 - #define SO_RCVBUFFORCE 33 29 - #define SO_KEEPALIVE 9 30 - #define SO_OOBINLINE 10 31 - #define SO_NO_CHECK 11 32 - #define SO_PRIORITY 12 33 - #define SO_LINGER 13 34 - #define SO_BSDCOMPAT 14 35 - #define SO_REUSEPORT 15 36 - #define SO_PASSCRED 16 37 - #define SO_PEERCRED 17 38 - #define SO_RCVLOWAT 18 39 - #define SO_SNDLOWAT 19 40 - #define SO_RCVTIMEO 20 41 - #define SO_SNDTIMEO 21 42 - 43 - /* Security levels - as per NRL IPv6 - don't actually do anything */ 44 - #define SO_SECURITY_AUTHENTICATION 22 45 - #define SO_SECURITY_ENCRYPTION_TRANSPORT 23 46 - #define SO_SECURITY_ENCRYPTION_NETWORK 24 47 - 48 - #define SO_BINDTODEVICE 25 49 - 50 - /* Socket filtering */ 51 - #define SO_ATTACH_FILTER 26 52 - #define SO_DETACH_FILTER 27 53 - #define SO_GET_FILTER SO_ATTACH_FILTER 54 - 55 - #define SO_PEERNAME 28 56 - #define SO_TIMESTAMP 29 57 - #define SCM_TIMESTAMP SO_TIMESTAMP 58 - 59 - #define SO_ACCEPTCONN 30 60 - 61 - #define SO_PEERSEC 31 62 - #define SO_PASSSEC 34 63 - #define SO_TIMESTAMPNS 35 64 - #define SCM_TIMESTAMPNS SO_TIMESTAMPNS 65 - 66 - #define SO_MARK 36 67 - 68 - #define SO_TIMESTAMPING 37 69 - #define SCM_TIMESTAMPING SO_TIMESTAMPING 70 - 71 - #define SO_PROTOCOL 38 72 - #define SO_DOMAIN 39 73 - 74 - #define SO_RXQ_OVFL 40 75 - 76 - #define SO_WIFI_STATUS 41 77 - #define SCM_WIFI_STATUS SO_WIFI_STATUS 78 - #define SO_PEEK_OFF 42 79 - 80 - /* Instruct lower device to use last 4-bytes of skb data as FCS */ 81 - #define SO_NOFCS 43 82 - 83 - #define SO_LOCK_FILTER 44 84 - 85 - #define SO_SELECT_ERR_QUEUE 45 86 - 87 - #define SO_BUSY_POLL 46 88 - 89 - #define SO_MAX_PACING_RATE 47 90 - 91 - #define SO_BPF_EXTENSIONS 48 92 - 93 - #define SO_INCOMING_CPU 49 94 - 95 - #define SO_ATTACH_BPF 50 96 - #define SO_DETACH_BPF SO_DETACH_FILTER 97 - 98 - #define SO_ATTACH_REUSEPORT_CBPF 51 99 - #define SO_ATTACH_REUSEPORT_EBPF 52 100 - 101 - #define SO_CNX_ADVICE 53 102 - 103 - #define SCM_TIMESTAMPING_OPT_STATS 54 104 - 105 - #define SO_MEMINFO 55 106 - 107 - #define SO_INCOMING_NAPI_ID 56 108 - 109 - #define SO_COOKIE 57 110 - 111 - #define SCM_TIMESTAMPING_PKTINFO 58 112 - 113 - #define SO_PEERGROUPS 59 114 - 115 - #define SO_ZEROCOPY 60 116 - 117 - #define SO_TXTIME 61 118 - #define SCM_TXTIME SO_TXTIME 119 - 120 - #define SO_BINDTOIFINDEX 62 121 - 122 - #endif /* _ASM_IA64_SOCKET_H */

+1

arch/s390/include/uapi/asm/Kbuild

··· 3 3 4 4 generated-y += unistd_32.h 5 5 generated-y += unistd_64.h 6 + generic-y += socket.h

-119

arch/s390/include/uapi/asm/socket.h

··· 1 - /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 2 - /* 3 - * S390 version 4 - * 5 - * Derived from "include/asm-i386/socket.h" 6 - */ 7 - 8 - #ifndef _ASM_SOCKET_H 9 - #define _ASM_SOCKET_H 10 - 11 - #include <asm/sockios.h> 12 - 13 - /* For setsockopt(2) */ 14 - #define SOL_SOCKET 1 15 - 16 - #define SO_DEBUG 1 17 - #define SO_REUSEADDR 2 18 - #define SO_TYPE 3 19 - #define SO_ERROR 4 20 - #define SO_DONTROUTE 5 21 - #define SO_BROADCAST 6 22 - #define SO_SNDBUF 7 23 - #define SO_RCVBUF 8 24 - #define SO_SNDBUFFORCE 32 25 - #define SO_RCVBUFFORCE 33 26 - #define SO_KEEPALIVE 9 27 - #define SO_OOBINLINE 10 28 - #define SO_NO_CHECK 11 29 - #define SO_PRIORITY 12 30 - #define SO_LINGER 13 31 - #define SO_BSDCOMPAT 14 32 - #define SO_REUSEPORT 15 33 - #define SO_PASSCRED 16 34 - #define SO_PEERCRED 17 35 - #define SO_RCVLOWAT 18 36 - #define SO_SNDLOWAT 19 37 - #define SO_RCVTIMEO 20 38 - #define SO_SNDTIMEO 21 39 - 40 - /* Security levels - as per NRL IPv6 - don't actually do anything */ 41 - #define SO_SECURITY_AUTHENTICATION 22 42 - #define SO_SECURITY_ENCRYPTION_TRANSPORT 23 43 - #define SO_SECURITY_ENCRYPTION_NETWORK 24 44 - 45 - #define SO_BINDTODEVICE 25 46 - 47 - /* Socket filtering */ 48 - #define SO_ATTACH_FILTER 26 49 - #define SO_DETACH_FILTER 27 50 - #define SO_GET_FILTER SO_ATTACH_FILTER 51 - 52 - #define SO_PEERNAME 28 53 - #define SO_TIMESTAMP 29 54 - #define SCM_TIMESTAMP SO_TIMESTAMP 55 - 56 - #define SO_ACCEPTCONN 30 57 - 58 - #define SO_PEERSEC 31 59 - #define SO_PASSSEC 34 60 - #define SO_TIMESTAMPNS 35 61 - #define SCM_TIMESTAMPNS SO_TIMESTAMPNS 62 - 63 - #define SO_MARK 36 64 - 65 - #define SO_TIMESTAMPING 37 66 - #define SCM_TIMESTAMPING SO_TIMESTAMPING 67 - 68 - #define SO_PROTOCOL 38 69 - #define SO_DOMAIN 39 70 - 71 - #define SO_RXQ_OVFL 40 72 - 73 - #define SO_WIFI_STATUS 41 74 - #define SCM_WIFI_STATUS SO_WIFI_STATUS 75 - #define SO_PEEK_OFF 42 76 - 77 - /* Instruct lower device to use last 4-bytes of skb data as FCS */ 78 - #define SO_NOFCS 43 79 - 80 - #define SO_LOCK_FILTER 44 81 - 82 - #define SO_SELECT_ERR_QUEUE 45 83 - 84 - #define SO_BUSY_POLL 46 85 - 86 - #define SO_MAX_PACING_RATE 47 87 - 88 - #define SO_BPF_EXTENSIONS 48 89 - 90 - #define SO_INCOMING_CPU 49 91 - 92 - #define SO_ATTACH_BPF 50 93 - #define SO_DETACH_BPF SO_DETACH_FILTER 94 - 95 - #define SO_ATTACH_REUSEPORT_CBPF 51 96 - #define SO_ATTACH_REUSEPORT_EBPF 52 97 - 98 - #define SO_CNX_ADVICE 53 99 - 100 - #define SCM_TIMESTAMPING_OPT_STATS 54 101 - 102 - #define SO_MEMINFO 55 103 - 104 - #define SO_INCOMING_NAPI_ID 56 105 - 106 - #define SO_COOKIE 57 107 - 108 - #define SCM_TIMESTAMPING_PKTINFO 58 109 - 110 - #define SO_PEERGROUPS 59 111 - 112 - #define SO_ZEROCOPY 60 113 - 114 - #define SO_TXTIME 61 115 - #define SCM_TXTIME SO_TXTIME 116 - 117 - #define SO_BINDTOIFINDEX 62 118 - 119 - #endif /* _ASM_SOCKET_H */

+1

arch/x86/include/uapi/asm/Kbuild

··· 3 3 generated-y += unistd_32.h 4 4 generated-y += unistd_64.h 5 5 generated-y += unistd_x32.h 6 + generic-y += socket.h

-1

arch/x86/include/uapi/asm/socket.h

··· 1 - #include <asm-generic/socket.h>

+1

arch/xtensa/include/asm/Kbuild

··· 25 25 generic-y += preempt.h 26 26 generic-y += rwsem.h 27 27 generic-y += sections.h 28 + generic-y += socket.h 28 29 generic-y += topology.h 29 30 generic-y += trace_clock.h 30 31 generic-y += vga.h

+1

arch/xtensa/include/uapi/asm/Kbuild

··· 2 2 3 3 generated-y += unistd_32.h 4 4 generic-y += kvm_para.h 5 + generic-y += socket.h

-124

arch/xtensa/include/uapi/asm/socket.h

··· 1 - /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 2 - /* 3 - * include/asm-xtensa/socket.h 4 - * 5 - * Copied from i386. 6 - * 7 - * This file is subject to the terms and conditions of the GNU General Public 8 - * License. See the file "COPYING" in the main directory of this archive 9 - * for more details. 10 - */ 11 - 12 - #ifndef _XTENSA_SOCKET_H 13 - #define _XTENSA_SOCKET_H 14 - 15 - #include <asm/sockios.h> 16 - 17 - /* For setsockoptions(2) */ 18 - #define SOL_SOCKET 1 19 - 20 - #define SO_DEBUG 1 21 - #define SO_REUSEADDR 2 22 - #define SO_TYPE 3 23 - #define SO_ERROR 4 24 - #define SO_DONTROUTE 5 25 - #define SO_BROADCAST 6 26 - #define SO_SNDBUF 7 27 - #define SO_RCVBUF 8 28 - #define SO_SNDBUFFORCE 32 29 - #define SO_RCVBUFFORCE 33 30 - #define SO_KEEPALIVE 9 31 - #define SO_OOBINLINE 10 32 - #define SO_NO_CHECK 11 33 - #define SO_PRIORITY 12 34 - #define SO_LINGER 13 35 - #define SO_BSDCOMPAT 14 36 - #define SO_REUSEPORT 15 37 - #define SO_PASSCRED 16 38 - #define SO_PEERCRED 17 39 - #define SO_RCVLOWAT 18 40 - #define SO_SNDLOWAT 19 41 - #define SO_RCVTIMEO 20 42 - #define SO_SNDTIMEO 21 43 - 44 - /* Security levels - as per NRL IPv6 - don't actually do anything */ 45 - 46 - #define SO_SECURITY_AUTHENTICATION 22 47 - #define SO_SECURITY_ENCRYPTION_TRANSPORT 23 48 - #define SO_SECURITY_ENCRYPTION_NETWORK 24 49 - 50 - #define SO_BINDTODEVICE 25 51 - 52 - /* Socket filtering */ 53 - 54 - #define SO_ATTACH_FILTER 26 55 - #define SO_DETACH_FILTER 27 56 - #define SO_GET_FILTER SO_ATTACH_FILTER 57 - 58 - #define SO_PEERNAME 28 59 - #define SO_TIMESTAMP 29 60 - #define SCM_TIMESTAMP SO_TIMESTAMP 61 - 62 - #define SO_ACCEPTCONN 30 63 - #define SO_PEERSEC 31 64 - #define SO_PASSSEC 34 65 - #define SO_TIMESTAMPNS 35 66 - #define SCM_TIMESTAMPNS SO_TIMESTAMPNS 67 - 68 - #define SO_MARK 36 69 - 70 - #define SO_TIMESTAMPING 37 71 - #define SCM_TIMESTAMPING SO_TIMESTAMPING 72 - 73 - #define SO_PROTOCOL 38 74 - #define SO_DOMAIN 39 75 - 76 - #define SO_RXQ_OVFL 40 77 - 78 - #define SO_WIFI_STATUS 41 79 - #define SCM_WIFI_STATUS SO_WIFI_STATUS 80 - #define SO_PEEK_OFF 42 81 - 82 - /* Instruct lower device to use last 4-bytes of skb data as FCS */ 83 - #define SO_NOFCS 43 84 - 85 - #define SO_LOCK_FILTER 44 86 - 87 - #define SO_SELECT_ERR_QUEUE 45 88 - 89 - #define SO_BUSY_POLL 46 90 - 91 - #define SO_MAX_PACING_RATE 47 92 - 93 - #define SO_BPF_EXTENSIONS 48 94 - 95 - #define SO_INCOMING_CPU 49 96 - 97 - #define SO_ATTACH_BPF 50 98 - #define SO_DETACH_BPF SO_DETACH_FILTER 99 - 100 - #define SO_ATTACH_REUSEPORT_CBPF 51 101 - #define SO_ATTACH_REUSEPORT_EBPF 52 102 - 103 - #define SO_CNX_ADVICE 53 104 - 105 - #define SCM_TIMESTAMPING_OPT_STATS 54 106 - 107 - #define SO_MEMINFO 55 108 - 109 - #define SO_INCOMING_NAPI_ID 56 110 - 111 - #define SO_COOKIE 57 112 - 113 - #define SCM_TIMESTAMPING_PKTINFO 58 114 - 115 - #define SO_PEERGROUPS 59 116 - 117 - #define SO_ZEROCOPY 60 118 - 119 - #define SO_TXTIME 61 120 - #define SCM_TXTIME SO_TXTIME 121 - 122 - #define SO_BINDTOIFINDEX 62 123 - 124 - #endif /* _XTENSA_SOCKET_H */