patch-2.1.30 linux/net/rose/rose_link.c

• Lines: 21
• Date: Thu Mar 20 18:17:16 1997
• Orig file: v2.1.29/linux/net/rose/rose_link.c
• Orig date: Thu Feb 27 10:57:32 1997

diff -u --recursive --new-file v2.1.29/linux/net/rose/rose_link.c linux/net/rose/rose_link.c
@@ -56,7 +56,7 @@
 
 	neigh->timer.data     = (unsigned long)neigh;
 	neigh->timer.function = &rose_link_timer;
-	neigh->timer.expires  = jiffies + 10;
+	neigh->timer.expires  = jiffies + (HZ / 10);
 
 	add_timer(&neigh->timer);
 }
@@ -278,10 +278,8 @@
 {
 	unsigned char *dptr;
 
-#ifdef CONFIG_FIREWALL
-	if (call_fw_firewall(PF_ROSE, skb->dev, skb->data, NULL) != FW_ACCEPT)
+	if (call_fw_firewall(PF_ROSE, skb->dev, skb->data, NULL,&skb) != FW_ACCEPT)
 		return;
-#endif
 
 	if (!rose_link_up(neigh))
 		neigh->restarted = 0;