diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-01-25 23:17:27 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-31 13:38:16 -0800 |
commit | a6238f21736af3f47bdebf3895f477f5f23f1af9 (patch) | |
tree | 6adcff1f9fdae33641697aee58a5ba206b6e5244 /net | |
parent | staging: remove smbfs (diff) | |
download | linux-dev-a6238f21736af3f47bdebf3895f477f5f23f1af9.tar.xz linux-dev-a6238f21736af3f47bdebf3895f477f5f23f1af9.zip |
appletalk: move to staging
For all I know, Appletalk is dead, the only reasonable
use right now would be nostalgia, and that can be served
well enough by old kernels. The code is largely not
in a bad shape, but it still uses the big kernel lock,
and nobody seems motivated to change that.
FWIW, the last release of MacOS that supported Appletalk
was MacOS X 10.5, made in 2007, and it has been abandoned
by Apple with 10.6. Using TCP/IP instead of Appletalk has
been supported since MacOS 7.6, which was released in
1997 and is able to run on most of the legacy hardware.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to '')
-rw-r--r-- | drivers/staging/appletalk/Makefile (renamed from net/appletalk/Makefile) | 7 | ||||
-rw-r--r-- | drivers/staging/appletalk/aarp.c (renamed from net/appletalk/aarp.c) | 2 | ||||
-rw-r--r-- | drivers/staging/appletalk/atalk_proc.c (renamed from net/appletalk/atalk_proc.c) | 2 | ||||
-rw-r--r-- | drivers/staging/appletalk/ddp.c (renamed from net/appletalk/ddp.c) | 4 | ||||
-rw-r--r-- | drivers/staging/appletalk/dev.c (renamed from net/appletalk/dev.c) | 0 | ||||
-rw-r--r-- | drivers/staging/appletalk/sysctl_net_atalk.c (renamed from net/appletalk/sysctl_net_atalk.c) | 2 | ||||
-rw-r--r-- | net/Kconfig | 1 | ||||
-rw-r--r-- | net/Makefile | 1 | ||||
-rw-r--r-- | net/socket.c | 1 |
9 files changed, 10 insertions, 10 deletions
diff --git a/net/appletalk/Makefile b/drivers/staging/appletalk/Makefile index 5cda56edef57..2a5129a5c6bc 100644 --- a/net/appletalk/Makefile +++ b/drivers/staging/appletalk/Makefile @@ -1,9 +1,12 @@ # -# Makefile for the Linux AppleTalk layer. +# Makefile for drivers/staging/appletalk # - obj-$(CONFIG_ATALK) += appletalk.o appletalk-y := aarp.o ddp.o dev.o appletalk-$(CONFIG_PROC_FS) += atalk_proc.o appletalk-$(CONFIG_SYSCTL) += sysctl_net_atalk.o + +obj-$(CONFIG_IPDDP) += ipddp.o +obj-$(CONFIG_COPS) += cops.o +obj-$(CONFIG_LTPC) += ltpc.o diff --git a/net/appletalk/aarp.c b/drivers/staging/appletalk/aarp.c index 50dce7981321..7163a1dd501f 100644 --- a/net/appletalk/aarp.c +++ b/drivers/staging/appletalk/aarp.c @@ -34,7 +34,7 @@ #include <net/sock.h> #include <net/datalink.h> #include <net/psnap.h> -#include <linux/atalk.h> +#include "atalk.h" #include <linux/delay.h> #include <linux/init.h> #include <linux/proc_fs.h> diff --git a/net/appletalk/atalk_proc.c b/drivers/staging/appletalk/atalk_proc.c index 6ef0e761e5de..d012ba2e67d1 100644 --- a/net/appletalk/atalk_proc.c +++ b/drivers/staging/appletalk/atalk_proc.c @@ -13,7 +13,7 @@ #include <linux/seq_file.h> #include <net/net_namespace.h> #include <net/sock.h> -#include <linux/atalk.h> +#include "atalk.h" static __inline__ struct atalk_iface *atalk_get_interface_idx(loff_t pos) diff --git a/net/appletalk/ddp.c b/drivers/staging/appletalk/ddp.c index c410b93fda2e..940dd1908339 100644 --- a/net/appletalk/ddp.c +++ b/drivers/staging/appletalk/ddp.c @@ -63,8 +63,8 @@ #include <net/sock.h> #include <net/tcp_states.h> #include <net/route.h> -#include <linux/atalk.h> -#include "../core/kmap_skb.h" +#include "atalk.h" +#include "../../net/core/kmap_skb.h" struct datalink_proto *ddp_dl, *aarp_dl; static const struct proto_ops atalk_dgram_ops; diff --git a/net/appletalk/dev.c b/drivers/staging/appletalk/dev.c index 6c8016f61866..6c8016f61866 100644 --- a/net/appletalk/dev.c +++ b/drivers/staging/appletalk/dev.c diff --git a/net/appletalk/sysctl_net_atalk.c b/drivers/staging/appletalk/sysctl_net_atalk.c index 04e9c0da7aa9..4c896b625b2b 100644 --- a/net/appletalk/sysctl_net_atalk.c +++ b/drivers/staging/appletalk/sysctl_net_atalk.c @@ -8,7 +8,7 @@ #include <linux/sysctl.h> #include <net/sock.h> -#include <linux/atalk.h> +#include "atalk.h" static struct ctl_table atalk_table[] = { { diff --git a/net/Kconfig b/net/Kconfig index 72840626284b..082c8bc977e1 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -204,7 +204,6 @@ source "net/8021q/Kconfig" source "net/decnet/Kconfig" source "net/llc/Kconfig" source "net/ipx/Kconfig" -source "drivers/net/appletalk/Kconfig" source "net/x25/Kconfig" source "net/lapb/Kconfig" source "net/econet/Kconfig" diff --git a/net/Makefile b/net/Makefile index a3330ebe2c53..16d9947b4b95 100644 --- a/net/Makefile +++ b/net/Makefile @@ -27,7 +27,6 @@ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_BRIDGE) += bridge/ obj-$(CONFIG_NET_DSA) += dsa/ obj-$(CONFIG_IPX) += ipx/ -obj-$(CONFIG_ATALK) += appletalk/ obj-$(CONFIG_WAN_ROUTER) += wanrouter/ obj-$(CONFIG_X25) += x25/ obj-$(CONFIG_LAPB) += lapb/ diff --git a/net/socket.c b/net/socket.c index ac2219f90d5d..26f7bcf36810 100644 --- a/net/socket.c +++ b/net/socket.c @@ -103,7 +103,6 @@ #include <linux/ipv6_route.h> #include <linux/route.h> #include <linux/sockios.h> -#include <linux/atalk.h> static int sock_no_open(struct inode *irrelevant, struct file *dontcare); static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, |