[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>
This commit is contained in:
committed by
David S. Miller
parent
0c7770c740
commit
98a82febb6
@@ -38,8 +38,6 @@
|
||||
#include <net/ax25.h>
|
||||
#include <net/netrom.h>
|
||||
|
||||
#ifdef CONFIG_INET
|
||||
|
||||
/*
|
||||
* Only allow IP over NET/ROM frames through if the netrom device is up.
|
||||
*/
|
||||
@@ -64,11 +62,12 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
|
||||
skb->nh.raw = skb->data;
|
||||
skb->pkt_type = PACKET_HOST;
|
||||
|
||||
ip_rcv(skb, skb->dev, NULL, skb->dev);
|
||||
netif_rx(skb);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_INET
|
||||
|
||||
static int nr_rebuild_header(struct sk_buff *skb)
|
||||
{
|
||||
|
Reference in New Issue
Block a user