diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-08-24 14:35:51 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 19:08:09 -0400 |
commit | 98a82febb6340466824c3a453738d4fbd05db81a (patch) | |
tree | ce1e22a4d8ccb662ed116a90c78dbf8bcbb3e0f4 /net/netrom/nr_dev.c | |
parent | 0c7770c740156c8802c23d24fc094d06967d997d (diff) |
[AX25/NETROM]: Cleanup direct calls into IP stack
Get rid of the calls to ip_rcv and arp_rcv which were layering
violations anyway. With those being replaced by netif_rx, less parts
of AX.25 and relatives depend on INET support actually being enabled.
This also will make PF_PACKET sockets work for IP and ARP packets
received over AX.25 and for IP packets over NET/ROM.
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom/nr_dev.c')
-rw-r--r-- | net/netrom/nr_dev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 83eb41d9b937..263da4c26494 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c | |||
@@ -38,8 +38,6 @@ | |||
38 | #include <net/ax25.h> | 38 | #include <net/ax25.h> |
39 | #include <net/netrom.h> | 39 | #include <net/netrom.h> |
40 | 40 | ||
41 | #ifdef CONFIG_INET | ||
42 | |||
43 | /* | 41 | /* |
44 | * Only allow IP over NET/ROM frames through if the netrom device is up. | 42 | * Only allow IP over NET/ROM frames through if the netrom device is up. |
45 | */ | 43 | */ |
@@ -64,11 +62,12 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) | |||
64 | skb->nh.raw = skb->data; | 62 | skb->nh.raw = skb->data; |
65 | skb->pkt_type = PACKET_HOST; | 63 | skb->pkt_type = PACKET_HOST; |
66 | 64 | ||
67 | ip_rcv(skb, skb->dev, NULL, skb->dev); | 65 | netif_rx(skb); |
68 | 66 | ||
69 | return 1; | 67 | return 1; |
70 | } | 68 | } |
71 | 69 | ||
70 | #ifdef CONFIG_INET | ||
72 | 71 | ||
73 | static int nr_rebuild_header(struct sk_buff *skb) | 72 | static int nr_rebuild_header(struct sk_buff *skb) |
74 | { | 73 | { |