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_out.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'net/ax25/ax25_out.c')
| -rw-r--r-- | net/ax25/ax25_out.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c index 423b6690b..fe5125def 100644 --- a/net/ax25/ax25_out.c +++ b/net/ax25/ax25_out.c @@ -50,7 +50,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 <asm/uaccess.h> #include <asm/system.h> @@ -58,7 +58,7 @@ #include <linux/mm.h> #include <linux/interrupt.h> -ax25_cb *ax25_send_frame(struct sk_buff *skb, int paclen, ax25_address *src, ax25_address *dest, ax25_digi *digi, struct device *dev) +ax25_cb *ax25_send_frame(struct sk_buff *skb, int paclen, ax25_address *src, ax25_address *dest, ax25_digi *digi, struct net_device *dev) { ax25_dev *ax25_dev; ax25_cb *ax25; @@ -379,11 +379,6 @@ void ax25_queue_xmit(struct sk_buff *skb) { unsigned char *ptr; - if (call_out_firewall(PF_AX25, skb->dev, skb->data, NULL, &skb) != FW_ACCEPT) { - kfree_skb(skb); - return; - } - skb->protocol = htons(ETH_P_AX25); skb->dev = ax25_fwd_dev(skb->dev); |