move some code to net/ipx/af_ipx.c
Subsystems (2)
PATCH 1/1 move some code to net/ipx/af_ipx.c
This patch moves some code only used in this file to net/ipx/af_ipx.c .
Signed-off-by Adrian Bunk <[email protected]>
---
This patch was already sent on:
- 14 Jan 2006
include/net/p8022.h | 13 ----- net/802/Makefile | 14 ++--- net/802/p8022.c | 66 --------------------------- net/802/p8023.c | 61 ------------------------- net/8021q/vlan.c | 1 net/8021q/vlan_dev.c | 1 net/ethernet/Makefile | 2 net/ethernet/pe2.c | 39 ---------------- net/ipx/af_ipx.c | 102 ++++++++++++++++++++++++++++++++++++++++-- 9 files changed, 106 insertions(+), 193 deletions(-)
net/ethernet/Makefile renamed from net/ethernet/Makefile.old +0 -2
@@ -4,5 +4,3 @@ obj-y += eth.o obj-$(CONFIG_SYSCTL) += sysctl_net_ether.o -obj-$(subst m,y,$(CONFIG_IPX)) += pe2.o -obj-$(subst m,y,$(CONFIG_ATALK)) += pe2.o
net/8021q/vlan.c renamed from net/8021q/vlan.c.old +0 -1
@@ -26,7 +26,6 @@#include <linux/mm.h> #include <linux/in.h> #include <linux/init.h> -#include <net/p8022.h> #include <net/arp.h> #include <linux/rtnetlink.h> #include <linux/notifier.h>
net/8021q/vlan_dev.c renamed from net/8021q/vlan_dev.c.old +0 -1
@@ -29,7 +29,6 @@#include <linux/netdevice.h> #include <linux/etherdevice.h> #include <net/datalink.h> -#include <net/p8022.h> #include <net/arp.h> #include "vlan.h"
net/ipx/af_ipx.c renamed from net/ipx/af_ipx.c.old +99 -3
117 lines not on this page · raw message
include/net/p8022.h deleted +0 -13
@@ -1,13 +0,0 @@ -#ifndef _NET_P8022_H -#define _NET_P8022_H -extern struct datalink_proto * -register_8022_client (unsigned char type, -int (*func)(struct sk_buff *skb, -struct net_device *dev, -struct packet_type *pt, -struct net_device *orig_dev)); -extern void unregister_8022_client (struct datalink_proto *proto); - -extern struct datalink_proto *make_8023_client (void ); -extern void destroy_8023_client (struct datalink_proto *dl); -#endif
net/ethernet/pe2.c deleted +0 -39
@@ -1,39 +0,0 @@ -#include <linux/in.h> -#include <linux/mm.h> -#include <linux/module.h> -#include <linux/netdevice.h> -#include <linux/skbuff.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 ); -if (dev->hard_header) - 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); -} - -EXPORT_SYMBOL (destroy_EII_client); -EXPORT_SYMBOL (make_EII_client);
net/802/p8022.c deleted +0 -66
66 lines not on this page · raw message
net/802/p8023.c deleted +0 -61
61 lines not on this page · raw message
net/802/Makefile renamed from net/802/Makefile.old +7 -7
@@ -4,10 +4,10 @@ # Check the p8022 selections against net/core/Makefile. obj-$(CONFIG_SYSCTL) += sysctl_net_802.o -obj-$(CONFIG_LLC) += p8022.o psnap.o -obj-$(CONFIG_TR) += p8022.o psnap.o tr.o sysctl_net_802.o -obj-$(CONFIG_NET_FC) += fc.o -obj-$(CONFIG_FDDI) += fddi.o -obj-$(CONFIG_HIPPI) += hippi.o -obj-$(CONFIG_IPX) += p8022.o psnap.o p8023.o -obj-$(CONFIG_ATALK) += p8022.o psnap.o +obj-$(CONFIG_LLC) += psnap.o +obj-$(CONFIG_TR) += psnap.o tr.o sysctl_net_802.o +obj-$(CONFIG_NET_FC) += fc.o +obj-$(CONFIG_FDDI) += fddi.o +obj-$(CONFIG_HIPPI) += hippi.o +obj-$(CONFIG_IPX) += psnap.o +obj-$(CONFIG_ATALK) += psnap.o