patch-2.1.30 linux/net/x25/x25_link.c

• Lines: 21
• Date: Thu Mar 20 18:17:16 1997
• Orig file: v2.1.29/linux/net/x25/x25_link.c
• Orig date: Sun Feb 2 05:18:53 1997

diff -u --recursive --new-file v2.1.29/linux/net/x25/x25_link.c linux/net/x25/x25_link.c
@@ -58,7 +58,7 @@
 
 	neigh->timer.data     = (unsigned long)neigh;
 	neigh->timer.function = &x25_link_timer;
-	neigh->timer.expires  = jiffies + 100;
+	neigh->timer.expires  = jiffies + (HZ / 1);
 
 	add_timer(&neigh->timer);
 }
@@ -240,10 +240,8 @@
 
 void x25_transmit_link(struct sk_buff *skb, struct x25_neigh *neigh)
 {
-#ifdef CONFIG_FIREWALL
-	if (call_fw_firewall(PF_X25, skb->dev, skb->data, NULL) != FW_ACCEPT)
+	if (call_fw_firewall(PF_X25, skb->dev, skb->data, NULL,&skb) != FW_ACCEPT)
 		return;
-#endif
 
 	switch (neigh->state) {
 		case X25_LINK_STATE_0: