patch-2.3.15 linux/net/x25/x25_dev.c

Next file: linux/net/x25/x25_link.c
Previous file: linux/net/x25/af_x25.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.14/linux/net/x25/x25_dev.c linux/net/x25/x25_dev.c
@@ -31,7 +31,6 @@
 #include <linux/stat.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
-#include <linux/if_arp.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <asm/segment.h>
@@ -43,7 +42,7 @@
 #include <linux/interrupt.h>
 #include <linux/notifier.h>
 #include <linux/proc_fs.h>
-#include <linux/firewall.h>
+#include <linux/if_arp.h>
 #include <net/x25.h>
 
 static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *neigh)
@@ -51,11 +50,6 @@
 	struct sock *sk;
 	unsigned short frametype;
 	unsigned int lci;
-
-	if (call_in_firewall(PF_X25, skb->dev, skb->data, NULL, &skb) != FW_ACCEPT) {
-		kfree_skb(skb);
-		return 0;
-	}
 
 	frametype = skb->data[2];
         lci = ((skb->data[0] << 8) & 0xF00) + ((skb->data[1] << 0) & 0x0FF);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)