patch-2.1.34 linux/drivers/net/shaper.c

• Lines: 18
• Date: Fri Apr 11 10:47:37 1997
• Orig file: v2.1.33/linux/drivers/net/shaper.c
• Orig date: Mon Apr 7 11:35:29 1997

diff -u --recursive --new-file v2.1.33/linux/drivers/net/shaper.c linux/drivers/net/shaper.c
@@ -87,7 +87,7 @@
 	/*
 	 *	Lock in an interrupt may fail
 	 */
-	if(sh->locked && intr_count)
+	if(sh->locked && in_interrupt())
 	{
 		restore_flags(flags);
 		return 0;
@@ -438,7 +438,7 @@
 	return sh->rebuild_header(skb);
 }
 
-static int shaper_cache(struct dst_entry *dst, struct dst_entry *neigh, struct hh_cache *hh)
+static int shaper_cache(struct dst_entry *dst, struct neighbour *neigh, struct hh_cache *hh)
 {
 	struct shaper *sh=dst->dev->priv;
 	struct device *tmp;