diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /net/ax25/ax25_in.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'net/ax25/ax25_in.c')
| -rw-r--r-- | net/ax25/ax25_in.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index dee4565ad..497022f23 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c @@ -54,7 +54,7 @@ #include <linux/inet.h> #include <linux/netdevice.h> #include <linux/skbuff.h> -#include <linux/firewall.h> +#include <linux/netfilter.h> #include <net/sock.h> #include <net/ip.h> /* For ip_rcv */ #include <net/arp.h> /* For arp_rcv */ @@ -213,7 +213,7 @@ static int ax25_process_rx_frame(ax25_cb *ax25, struct sk_buff *skb, int type, i return queued; } -static int ax25_rcv(struct sk_buff *skb, struct device *dev, ax25_address *dev_addr, struct packet_type *ptype) +static int ax25_rcv(struct sk_buff *skb, struct net_device *dev, ax25_address *dev_addr, struct packet_type *ptype) { struct sock *make; struct sock *sk; @@ -238,11 +238,6 @@ static int ax25_rcv(struct sk_buff *skb, struct device *dev, ax25_address *dev_a return 0; } - if (call_in_firewall(PF_AX25, skb->dev, skb->h.raw, NULL, &skb) != FW_ACCEPT) { - kfree_skb(skb); - return 0; - } - /* * Parse the address header. */ @@ -469,7 +464,7 @@ static int ax25_rcv(struct sk_buff *skb, struct device *dev, ax25_address *dev_a /* * Receive an AX.25 frame via a SLIP interface. */ -int ax25_kiss_rcv(struct sk_buff *skb, struct device *dev, struct packet_type *ptype) +int ax25_kiss_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype) { skb->sk = NULL; /* Initially we don't know who it's for */ skb->destructor = NULL; /* Who initializes this, dammit?! */ |