Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2edfd8e0 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by David S. Miller
Browse files

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



Many architectures maintain an arch specific copy of the
file even though there are no differences with the asm-generic
one. Allow these architectures to use the generic one instead.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Acked-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Cc: chris@zankel.net
Cc: fenghua.yu@intel.com
Cc: tglx@linutronix.de
Cc: schwidefsky@de.ibm.com
Cc: linux-ia64@vger.kernel.org
Cc: linux-xtensa@linux-xtensa.org
Cc: linux-s390@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe0c72f3

arch/ia64/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ include include/uapi/asm-generic/Kbuild.asm 


generated-y += unistd_64.h

generic-y += kvm_para.h

generic-y += socket.h

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

deleted100644 → 0
+0 −122
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _ASM_IA64_SOCKET_H

#define _ASM_IA64_SOCKET_H



/*

 * Socket related defines.

 *

 * Based on <asm-i386/socket.h>.

 *

 * Modified 1998-2000

 *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co

 */



#include <asm/sockios.h>



/* For setsockopt(2) */

#define SOL_SOCKET	1



#define SO_DEBUG	1

#define SO_REUSEADDR	2

#define SO_TYPE		3

#define SO_ERROR	4

#define SO_DONTROUTE	5

#define SO_BROADCAST	6

#define SO_SNDBUF	7

#define SO_RCVBUF	8

#define SO_SNDBUFFORCE	32

#define SO_RCVBUFFORCE	33

#define SO_KEEPALIVE	9

#define SO_OOBINLINE	10

#define SO_NO_CHECK	11

#define SO_PRIORITY	12

#define SO_LINGER	13

#define SO_BSDCOMPAT	14

#define SO_REUSEPORT	15

#define SO_PASSCRED	16

#define SO_PEERCRED	17

#define SO_RCVLOWAT	18

#define SO_SNDLOWAT	19

#define SO_RCVTIMEO	20

#define SO_SNDTIMEO	21



/* Security levels - as per NRL IPv6 - don't actually do anything */

#define SO_SECURITY_AUTHENTICATION		22

#define SO_SECURITY_ENCRYPTION_TRANSPORT	23

#define SO_SECURITY_ENCRYPTION_NETWORK		24



#define SO_BINDTODEVICE		25



/* Socket filtering */

#define SO_ATTACH_FILTER	26

#define SO_DETACH_FILTER	27

#define SO_GET_FILTER		SO_ATTACH_FILTER



#define SO_PEERNAME		28

#define SO_TIMESTAMP		29

#define SCM_TIMESTAMP		SO_TIMESTAMP



#define SO_ACCEPTCONN		30



#define SO_PEERSEC             31

#define SO_PASSSEC		34

#define SO_TIMESTAMPNS		35

#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS



#define SO_MARK			36



#define SO_TIMESTAMPING		37

#define SCM_TIMESTAMPING	SO_TIMESTAMPING



#define SO_PROTOCOL		38

#define SO_DOMAIN		39



#define SO_RXQ_OVFL             40



#define SO_WIFI_STATUS		41

#define SCM_WIFI_STATUS		SO_WIFI_STATUS

#define SO_PEEK_OFF		42



/* Instruct lower device to use last 4-bytes of skb data as FCS */

#define SO_NOFCS		43



#define SO_LOCK_FILTER		44



#define SO_SELECT_ERR_QUEUE	45



#define SO_BUSY_POLL		46



#define SO_MAX_PACING_RATE	47



#define SO_BPF_EXTENSIONS	48



#define SO_INCOMING_CPU		49



#define SO_ATTACH_BPF		50

#define SO_DETACH_BPF		SO_DETACH_FILTER



#define SO_ATTACH_REUSEPORT_CBPF	51

#define SO_ATTACH_REUSEPORT_EBPF	52



#define SO_CNX_ADVICE		53



#define SCM_TIMESTAMPING_OPT_STATS	54



#define SO_MEMINFO		55



#define SO_INCOMING_NAPI_ID	56



#define SO_COOKIE		57



#define SCM_TIMESTAMPING_PKTINFO	58



#define SO_PEERGROUPS		59



#define SO_ZEROCOPY		60



#define SO_TXTIME		61

#define SCM_TXTIME		SO_TXTIME



#define SO_BINDTOIFINDEX	62



#endif /* _ASM_IA64_SOCKET_H */

arch/s390/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ include include/uapi/asm-generic/Kbuild.asm 


generated-y += unistd_32.h

generated-y += unistd_64.h

generic-y += socket.h

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

deleted100644 → 0
+0 −119
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 *  S390 version

 *

 *  Derived from "include/asm-i386/socket.h"

 */



#ifndef _ASM_SOCKET_H

#define _ASM_SOCKET_H



#include <asm/sockios.h>



/* For setsockopt(2) */

#define SOL_SOCKET	1



#define SO_DEBUG	1

#define SO_REUSEADDR	2

#define SO_TYPE		3

#define SO_ERROR	4

#define SO_DONTROUTE	5

#define SO_BROADCAST	6

#define SO_SNDBUF	7

#define SO_RCVBUF	8

#define SO_SNDBUFFORCE	32

#define SO_RCVBUFFORCE	33

#define SO_KEEPALIVE	9

#define SO_OOBINLINE	10

#define SO_NO_CHECK	11

#define SO_PRIORITY	12

#define SO_LINGER	13

#define SO_BSDCOMPAT	14

#define SO_REUSEPORT	15

#define SO_PASSCRED	16

#define SO_PEERCRED	17

#define SO_RCVLOWAT	18

#define SO_SNDLOWAT	19

#define SO_RCVTIMEO	20

#define SO_SNDTIMEO	21



/* Security levels - as per NRL IPv6 - don't actually do anything */

#define SO_SECURITY_AUTHENTICATION		22

#define SO_SECURITY_ENCRYPTION_TRANSPORT	23

#define SO_SECURITY_ENCRYPTION_NETWORK		24



#define SO_BINDTODEVICE	25



/* Socket filtering */

#define SO_ATTACH_FILTER        26

#define SO_DETACH_FILTER        27

#define SO_GET_FILTER		SO_ATTACH_FILTER



#define SO_PEERNAME		28

#define SO_TIMESTAMP		29

#define SCM_TIMESTAMP		SO_TIMESTAMP



#define SO_ACCEPTCONN		30



#define SO_PEERSEC		31

#define SO_PASSSEC		34

#define SO_TIMESTAMPNS		35

#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS



#define SO_MARK			36



#define SO_TIMESTAMPING		37

#define SCM_TIMESTAMPING	SO_TIMESTAMPING



#define SO_PROTOCOL		38

#define SO_DOMAIN		39



#define SO_RXQ_OVFL             40



#define SO_WIFI_STATUS		41

#define SCM_WIFI_STATUS		SO_WIFI_STATUS

#define SO_PEEK_OFF		42



/* Instruct lower device to use last 4-bytes of skb data as FCS */

#define SO_NOFCS		43



#define SO_LOCK_FILTER		44



#define SO_SELECT_ERR_QUEUE	45



#define SO_BUSY_POLL		46



#define SO_MAX_PACING_RATE	47



#define SO_BPF_EXTENSIONS	48



#define SO_INCOMING_CPU		49



#define SO_ATTACH_BPF		50

#define SO_DETACH_BPF		SO_DETACH_FILTER



#define SO_ATTACH_REUSEPORT_CBPF	51

#define SO_ATTACH_REUSEPORT_EBPF	52



#define SO_CNX_ADVICE		53



#define SCM_TIMESTAMPING_OPT_STATS	54



#define	SO_MEMINFO		55



#define SO_INCOMING_NAPI_ID	56



#define SO_COOKIE		57



#define SCM_TIMESTAMPING_PKTINFO	58



#define SO_PEERGROUPS		59



#define SO_ZEROCOPY		60



#define SO_TXTIME		61

#define SCM_TXTIME		SO_TXTIME



#define SO_BINDTOIFINDEX	62



#endif /* _ASM_SOCKET_H */

arch/x86/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ include include/uapi/asm-generic/Kbuild.asm 
generated-y += unistd_32.h

generated-y += unistd_64.h

generated-y += unistd_x32.h

generic-y += socket.h