ipx: move peII functions

The Ethernet II wrapper is only used by IPX protocol, may have once
been used by Appletalk but not currently. Therefore it makes sense to
move it to the IPX dust bin and drop the exports.

Build tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ethernet/Makefile b/net/ethernet/Makefile
index 7cef1d8..3231775 100644 (file)
--- a/net/ethernet/Makefile
+++ b/net/ethernet/Makefile
@@ -3,5 +3,3 @@
 #
 
 obj-y                                  += eth.o
-obj-$(subst m,y,$(CONFIG_IPX))         += pe2.o
-obj-$(subst m,y,$(CONFIG_ATALK))       += pe2.o

diff --git a/net/ethernet/pe2.c b/net/ethernet/pe2.c
deleted file mode 100644 (file)
index 85d574a..0000000
--- a/net/ethernet/pe2.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <linux/in.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/netdevice.h>
-#include <linux/skbuff.h>
-#include <linux/slab.h>
-
-#include <net/datalink.h>
-
-static int pEII_request(struct datalink_proto *dl,
-                       struct sk_buff *skb, unsigned char *dest_node)
-{
-       struct net_device *dev = skb->dev;
-
-       skb->protocol = htons(ETH_P_IPX);
-       dev_hard_header(skb, dev, ETH_P_IPX, dest_node, NULL, skb->len);
-       return dev_queue_xmit(skb);
-}
-
-struct datalink_proto *make_EII_client(void)
-{
-       struct datalink_proto *proto = kmalloc(sizeof(*proto), GFP_ATOMIC);
-
-       if (proto) {
-               proto->header_length = 0;
-               proto->request = pEII_request;
-       }
-
-       return proto;
-}
-EXPORT_SYMBOL(make_EII_client);
-
-void destroy_EII_client(struct datalink_proto *dl)
-{
-       kfree(dl);
-}
-EXPORT_SYMBOL(destroy_EII_client);

diff --git a/net/ipx/Makefile b/net/ipx/Makefile
index 4b95e3e..440fafa 100644 (file)
--- a/net/ipx/Makefile
+++ b/net/ipx/Makefile
@@ -4,5 +4,5 @@
 
 obj-$(CONFIG_IPX) += ipx.o
 
-ipx-y                  := af_ipx.o ipx_route.o ipx_proc.o
+ipx-y                  := af_ipx.o ipx_route.o ipx_proc.o pe2.o
 ipx-$(CONFIG_SYSCTL)   += sysctl_net_ipx.o

diff --git a/net/ipx/pe2.c b/net/ipx/pe2.c
new file mode 100644 (file)
index 0000000..32dcd60
--- /dev/null
+++ b/net/ipx/pe2.c
@@ -0,0 +1,35 @@
+#include <linux/in.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+
+#include <net/datalink.h>
+
+static int pEII_request(struct datalink_proto *dl,
+                       struct sk_buff *skb, unsigned char *dest_node)
+{
+       struct net_device *dev = skb->dev;
+
+       skb->protocol = htons(ETH_P_IPX);
+       dev_hard_header(skb, dev, ETH_P_IPX, dest_node, NULL, skb->len);
+       return dev_queue_xmit(skb);
+}
+
+struct datalink_proto *make_EII_client(void)
+{
+       struct datalink_proto *proto = kmalloc(sizeof(*proto), GFP_ATOMIC);
+
+       if (proto) {
+               proto->header_length = 0;
+               proto->request = pEII_request;
+       }
+
+       return proto;
+}
+
+void destroy_EII_client(struct datalink_proto *dl)
+{
+       kfree(dl);
+}