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

Next file: linux/drivers/net/smc-mca.c
Previous file: linux/drivers/net/pcnet32.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.104/linux/drivers/net/shaper.c linux/drivers/net/shaper.c
@@ -326,7 +326,8 @@
 			 */
 			 
 			skb_unlink(skb);
-			shaper->recovery=jiffies+skb->shapelen;
+			if (shaper->recovery < skb->shapeclock + skb->shapelen)
+				shaper->recovery = skb->shapeclock + skb->shapelen;
 			restore_flags(flags);
 
 			/*

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov