Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 83bd1b793e1e6b68be4f7b18752de9620137dfa2

Authored by stephen hemminger
Committed by David S. Miller
1 parent d8f1641b58
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 4 changed files with 36 additions and 40 deletions Side-by-side Diff

net/ethernet/Makefile
Diff comments   View file @ 83bd1b7
... ... @@ -3,6 +3,4 @@
3 3 #
4 4  
5 5 obj-y += eth.o
6   -obj-$(subst m,y,$(CONFIG_IPX)) += pe2.o
7   -obj-$(subst m,y,$(CONFIG_ATALK)) += pe2.o
net/ethernet/pe2.c
View file @ 83bd1b7
1   -#include <linux/in.h>
2   -#include <linux/mm.h>
3   -#include <linux/module.h>
4   -#include <linux/netdevice.h>
5   -#include <linux/skbuff.h>
6   -#include <linux/slab.h>
7   -
8   -#include <net/datalink.h>
9   -
10   -static int pEII_request(struct datalink_proto *dl,
11   - struct sk_buff *skb, unsigned char *dest_node)
12   -{
13   - struct net_device *dev = skb->dev;
14   -
15   - skb->protocol = htons(ETH_P_IPX);
16   - dev_hard_header(skb, dev, ETH_P_IPX, dest_node, NULL, skb->len);
17   - return dev_queue_xmit(skb);
18   -}
19   -
20   -struct datalink_proto *make_EII_client(void)
21   -{
22   - struct datalink_proto *proto = kmalloc(sizeof(*proto), GFP_ATOMIC);
23   -
24   - if (proto) {
25   - proto->header_length = 0;
26   - proto->request = pEII_request;
27   - }
28   -
29   - return proto;
30   -}
31   -EXPORT_SYMBOL(make_EII_client);
32   -
33   -void destroy_EII_client(struct datalink_proto *dl)
34   -{
35   - kfree(dl);
36   -}
37   -EXPORT_SYMBOL(destroy_EII_client);
... ... @@ -4,6 +4,6 @@
4 4  
5 5 obj-$(CONFIG_IPX) += ipx.o
6 6  
7   -ipx-y := af_ipx.o ipx_route.o ipx_proc.o
  7 +ipx-y := af_ipx.o ipx_route.o ipx_proc.o pe2.o
8 8 ipx-$(CONFIG_SYSCTL) += sysctl_net_ipx.o
  1 +#include <linux/in.h>
  2 +#include <linux/mm.h>
  3 +#include <linux/module.h>
  4 +#include <linux/netdevice.h>
  5 +#include <linux/skbuff.h>
  6 +#include <linux/slab.h>
  7 +
  8 +#include <net/datalink.h>
  9 +
  10 +static int pEII_request(struct datalink_proto *dl,
  11 + struct sk_buff *skb, unsigned char *dest_node)
  12 +{
  13 + struct net_device *dev = skb->dev;
  14 +
  15 + skb->protocol = htons(ETH_P_IPX);
  16 + dev_hard_header(skb, dev, ETH_P_IPX, dest_node, NULL, skb->len);
  17 + return dev_queue_xmit(skb);
  18 +}
  19 +
  20 +struct datalink_proto *make_EII_client(void)
  21 +{
  22 + struct datalink_proto *proto = kmalloc(sizeof(*proto), GFP_ATOMIC);
  23 +
  24 + if (proto) {
  25 + proto->header_length = 0;
  26 + proto->request = pEII_request;
  27 + }
  28 +
  29 + return proto;
  30 +}
  31 +
  32 +void destroy_EII_client(struct datalink_proto *dl)
  33 +{
  34 + kfree(dl);
  35 +}