From: <gerg@snapgear.com>
To: linux-m68k@vger.kernel.org, linux-arch@vger.kernel.org
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [PATCH v2 11/11] m68k: switch to using the asm-generic socket.h
Date: Mon, 29 Oct 2012 15:49:34 +1000 [thread overview]
Message-ID: <1351489774-14263-12-git-send-email-gerg@snapgear.com> (raw)
In-Reply-To: <1351489774-14263-1-git-send-email-gerg@snapgear.com>
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local socket.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/socket.h | 72 -----------------------------------
3 files changed, 1 insertions(+), 73 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/socket.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 2801fd5..fe821a2 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -28,6 +28,7 @@ generic-y += sembuf.h
generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
+generic-y += socket.h
generic-y += sockios.h
generic-y += spinlock.h
generic-y += statfs.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 1e2314e..aebdbf5 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -13,7 +13,6 @@ header-y += ptrace.h
header-y += setup.h
header-y += sigcontext.h
header-y += signal.h
-header-y += socket.h
header-y += stat.h
header-y += swab.h
header-y += unistd.h
diff --git a/arch/m68k/include/uapi/asm/socket.h b/arch/m68k/include/uapi/asm/socket.h
deleted file mode 100644
index d1be684..0000000
--- a/arch/m68k/include/uapi/asm/socket.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#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
-/* To add :#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_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
-
-#endif /* _ASM_SOCKET_H */
--
1.7.0.4
next prev parent reply other threads:[~2012-10-29 5:49 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 02/11] m68k: switch to using the asm-generic hw_irq.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 03/11] m68k: switch to using the asm-generic shmparam.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 04/11] m68k: switch to using the asm-generic msgbuf.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 05/11] m68k: switch to using the asm-generic shmbuf.h gerg
2012-10-29 5:49 ` [PATCH v2 06/11] m68k: switch to using the asm-generic sembuf.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 07/11] m68k: switch to using the asm-generic spinlock.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 08/11] m68k: switch to using the asm-generic termbits.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 09/11] m68k: switch to using the asm-generic termios.h gerg
2012-10-29 5:49 ` [PATCH v2 10/11] m68k: switch to using the asm-generic sockios.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg [this message]
2012-10-29 5:49 ` [PATCH v2 11/11] m68k: switch to using the asm-generic socket.h gerg
2012-10-29 10:42 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h David Howells
2012-10-29 10:42 ` David Howells
2012-10-30 6:21 ` Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351489774-14263-12-git-send-email-gerg@snapgear.com \
--to=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).