aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS3
-rw-r--r--drivers/net/Makefile1
-rw-r--r--drivers/net/appletalk/Kconfig (renamed from drivers/staging/appletalk/Kconfig)0
-rw-r--r--drivers/net/appletalk/Makefile7
-rw-r--r--drivers/net/appletalk/cops.c (renamed from drivers/staging/appletalk/cops.c)2
-rw-r--r--drivers/net/appletalk/cops.h (renamed from drivers/staging/appletalk/cops.h)0
-rw-r--r--drivers/net/appletalk/cops_ffdrv.h (renamed from drivers/staging/appletalk/cops_ffdrv.h)0
-rw-r--r--drivers/net/appletalk/cops_ltdrv.h (renamed from drivers/staging/appletalk/cops_ltdrv.h)0
-rw-r--r--drivers/net/appletalk/ipddp.c (renamed from drivers/staging/appletalk/ipddp.c)2
-rw-r--r--drivers/net/appletalk/ipddp.h (renamed from drivers/staging/appletalk/ipddp.h)0
-rw-r--r--drivers/net/appletalk/ltpc.c (renamed from drivers/staging/appletalk/ltpc.c)2
-rw-r--r--drivers/net/appletalk/ltpc.h (renamed from drivers/staging/appletalk/ltpc.h)0
-rw-r--r--drivers/staging/Kconfig2
-rw-r--r--drivers/staging/Makefile1
-rw-r--r--fs/compat_ioctl.c1
-rw-r--r--include/linux/Kbuild1
-rw-r--r--include/linux/atalk.h (renamed from drivers/staging/appletalk/atalk.h)0
-rw-r--r--net/Kconfig1
-rw-r--r--net/Makefile1
-rw-r--r--net/appletalk/Makefile (renamed from drivers/staging/appletalk/Makefile)7
-rw-r--r--net/appletalk/aarp.c (renamed from drivers/staging/appletalk/aarp.c)2
-rw-r--r--net/appletalk/atalk_proc.c (renamed from drivers/staging/appletalk/atalk_proc.c)2
-rw-r--r--net/appletalk/ddp.c (renamed from drivers/staging/appletalk/ddp.c)4
-rw-r--r--net/appletalk/dev.c (renamed from drivers/staging/appletalk/dev.c)0
-rw-r--r--net/appletalk/sysctl_net_atalk.c (renamed from drivers/staging/appletalk/sysctl_net_atalk.c)2
-rw-r--r--net/socket.c1
26 files changed, 25 insertions, 17 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3118d67d68f..dd6ca456cde 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -554,7 +554,8 @@ F: drivers/hwmon/applesmc.c
APPLETALK NETWORK LAYER
M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
S: Maintained
-F: drivers/staging/appletalk/
+F: drivers/net/appletalk/
+F: net/appletalk/
ARC FRAMEBUFFER DRIVER
M: Jaya Kumar <jayalk@intworks.biz>
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 11a9c053f0c..b90738d1399 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -265,6 +265,7 @@ obj-$(CONFIG_MACB) += macb.o
obj-$(CONFIG_S6GMAC) += s6gmac.o
obj-$(CONFIG_ARM) += arm/
+obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
diff --git a/drivers/staging/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
index 0b376a99097..0b376a99097 100644
--- a/drivers/staging/appletalk/Kconfig
+++ b/drivers/net/appletalk/Kconfig
diff --git a/drivers/net/appletalk/Makefile b/drivers/net/appletalk/Makefile
new file mode 100644
index 00000000000..6cfc705f7c5
--- /dev/null
+++ b/drivers/net/appletalk/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for drivers/net/appletalk
+#
+
+obj-$(CONFIG_IPDDP) += ipddp.o
+obj-$(CONFIG_COPS) += cops.o
+obj-$(CONFIG_LTPC) += ltpc.o
diff --git a/drivers/staging/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 661d42eff7d..748c9f526e7 100644
--- a/drivers/staging/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -65,6 +65,7 @@ static const char *version =
#include <linux/if_arp.h>
#include <linux/if_ltalk.h>
#include <linux/delay.h> /* For udelay() */
+#include <linux/atalk.h>
#include <linux/spinlock.h>
#include <linux/bitops.h>
#include <linux/jiffies.h>
@@ -73,7 +74,6 @@ static const char *version =
#include <asm/io.h>
#include <asm/dma.h>
-#include "atalk.h"
#include "cops.h" /* Our Stuff */
#include "cops_ltdrv.h" /* Firmware code for Tangent type cards. */
#include "cops_ffdrv.h" /* Firmware code for Dayna type cards. */
diff --git a/drivers/staging/appletalk/cops.h b/drivers/net/appletalk/cops.h
index fd2750b269c..fd2750b269c 100644
--- a/drivers/staging/appletalk/cops.h
+++ b/drivers/net/appletalk/cops.h
diff --git a/drivers/staging/appletalk/cops_ffdrv.h b/drivers/net/appletalk/cops_ffdrv.h
index b02005087c1..b02005087c1 100644
--- a/drivers/staging/appletalk/cops_ffdrv.h
+++ b/drivers/net/appletalk/cops_ffdrv.h
diff --git a/drivers/staging/appletalk/cops_ltdrv.h b/drivers/net/appletalk/cops_ltdrv.h
index c699b1ad31d..c699b1ad31d 100644
--- a/drivers/staging/appletalk/cops_ltdrv.h
+++ b/drivers/net/appletalk/cops_ltdrv.h
diff --git a/drivers/staging/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index 58b4e6098ad..10d0dba572c 100644
--- a/drivers/staging/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -29,12 +29,12 @@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/ip.h>
+#include <linux/atalk.h>
#include <linux/if_arp.h>
#include <linux/slab.h>
#include <net/route.h>
#include <asm/uaccess.h>
-#include "atalk.h"
#include "ipddp.h" /* Our stuff */
static const char version[] = KERN_INFO "ipddp.c:v0.01 8/28/97 Bradford W. Johnson <johns393@maroon.tc.umn.edu>\n";
diff --git a/drivers/staging/appletalk/ipddp.h b/drivers/net/appletalk/ipddp.h
index 531519da99a..531519da99a 100644
--- a/drivers/staging/appletalk/ipddp.h
+++ b/drivers/net/appletalk/ipddp.h
diff --git a/drivers/staging/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 60caf892695..e69eead12ec 100644
--- a/drivers/staging/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -225,6 +225,7 @@ static int dma;
#include <linux/if_ltalk.h>
#include <linux/delay.h>
#include <linux/timer.h>
+#include <linux/atalk.h>
#include <linux/bitops.h>
#include <linux/gfp.h>
@@ -233,7 +234,6 @@ static int dma;
#include <asm/io.h>
/* our stuff */
-#include "atalk.h"
#include "ltpc.h"
static DEFINE_SPINLOCK(txqueue_lock);
diff --git a/drivers/staging/appletalk/ltpc.h b/drivers/net/appletalk/ltpc.h
index cd30544a372..cd30544a372 100644
--- a/drivers/staging/appletalk/ltpc.h
+++ b/drivers/net/appletalk/ltpc.h
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 584d4e26480..b80755da539 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -169,8 +169,6 @@ source "drivers/staging/bcm/Kconfig"
source "drivers/staging/ft1000/Kconfig"
-source "drivers/staging/appletalk/Kconfig"
-
source "drivers/staging/intel_sst/Kconfig"
source "drivers/staging/speakup/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 88f0c64e7e5..fd26509e5ef 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -65,7 +65,6 @@ obj-$(CONFIG_ATH6K_LEGACY) += ath6kl/
obj-$(CONFIG_USB_ENESTORAGE) += keucr/
obj-$(CONFIG_BCM_WIMAX) += bcm/
obj-$(CONFIG_FT1000) += ft1000/
-obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_SND_INTEL_SST) += intel_sst/
obj-$(CONFIG_SPEAKUP) += speakup/
obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217) += cptm1217/
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 86a2d7d905c..61abb638b4b 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -56,6 +56,7 @@
#include <linux/syscalls.h>
#include <linux/i2c.h>
#include <linux/i2c-dev.h>
+#include <linux/atalk.h>
#include <linux/gfp.h>
#include <net/bluetooth/bluetooth.h>
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 362041b73a2..2296d8b1931 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -43,6 +43,7 @@ header-y += agpgart.h
header-y += aio_abi.h
header-y += apm_bios.h
header-y += arcfb.h
+header-y += atalk.h
header-y += atm.h
header-y += atm_eni.h
header-y += atm_he.h
diff --git a/drivers/staging/appletalk/atalk.h b/include/linux/atalk.h
index d34c187432e..d34c187432e 100644
--- a/drivers/staging/appletalk/atalk.h
+++ b/include/linux/atalk.h
diff --git a/net/Kconfig b/net/Kconfig
index 082c8bc977e..72840626284 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -204,6 +204,7 @@ 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 16d9947b4b9..a3330ebe2c5 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -27,6 +27,7 @@ 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/drivers/staging/appletalk/Makefile b/net/appletalk/Makefile
index 2a5129a5c6b..5cda56edef5 100644
--- a/drivers/staging/appletalk/Makefile
+++ b/net/appletalk/Makefile
@@ -1,12 +1,9 @@
#
-# Makefile for drivers/staging/appletalk
+# Makefile for the Linux AppleTalk layer.
#
+
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/drivers/staging/appletalk/aarp.c b/net/appletalk/aarp.c
index 7163a1dd501..50dce798132 100644
--- a/drivers/staging/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -34,7 +34,7 @@
#include <net/sock.h>
#include <net/datalink.h>
#include <net/psnap.h>
-#include "atalk.h"
+#include <linux/atalk.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
diff --git a/drivers/staging/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
index d012ba2e67d..6ef0e761e5d 100644
--- a/drivers/staging/appletalk/atalk_proc.c
+++ b/net/appletalk/atalk_proc.c
@@ -13,7 +13,7 @@
#include <linux/seq_file.h>
#include <net/net_namespace.h>
#include <net/sock.h>
-#include "atalk.h"
+#include <linux/atalk.h>
static __inline__ struct atalk_iface *atalk_get_interface_idx(loff_t pos)
diff --git a/drivers/staging/appletalk/ddp.c b/net/appletalk/ddp.c
index 940dd190833..c410b93fda2 100644
--- a/drivers/staging/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -63,8 +63,8 @@
#include <net/sock.h>
#include <net/tcp_states.h>
#include <net/route.h>
-#include "atalk.h"
-#include "../../net/core/kmap_skb.h"
+#include <linux/atalk.h>
+#include "../core/kmap_skb.h"
struct datalink_proto *ddp_dl, *aarp_dl;
static const struct proto_ops atalk_dgram_ops;
diff --git a/drivers/staging/appletalk/dev.c b/net/appletalk/dev.c
index 6c8016f6186..6c8016f6186 100644
--- a/drivers/staging/appletalk/dev.c
+++ b/net/appletalk/dev.c
diff --git a/drivers/staging/appletalk/sysctl_net_atalk.c b/net/appletalk/sysctl_net_atalk.c
index 4c896b625b2..04e9c0da7aa 100644
--- a/drivers/staging/appletalk/sysctl_net_atalk.c
+++ b/net/appletalk/sysctl_net_atalk.c
@@ -8,7 +8,7 @@
#include <linux/sysctl.h>
#include <net/sock.h>
-#include "atalk.h"
+#include <linux/atalk.h>
static struct ctl_table atalk_table[] = {
{
diff --git a/net/socket.c b/net/socket.c
index 26f7bcf3681..ac2219f90d5 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -103,6 +103,7 @@
#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,
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2024-12-08 18:09:52 +0000