X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fshaper.c;h=221354eea21f9a9257771e68074821ea7ea64c2f;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=88e212043a43969cd0b9ea1447fe7265f10deb58;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
index 88e212043..221354eea 100644
--- a/drivers/net/shaper.c
+++ b/drivers/net/shaper.c
@@ -83,7 +83,6 @@
 #include <linux/if_arp.h>
 #include <linux/init.h>
 #include <linux/if_shaper.h>
-#include <linux/jiffies.h>
 
 #include <net/dst.h>
 #include <net/arp.h>
@@ -169,7 +168,7 @@ static int shaper_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		/*
 		 *	Queue over time. Spill packet.
 		 */
-		if(time_after(SHAPERCB(skb)->shapeclock,jiffies + SHAPER_LATENCY)) {
+		if(SHAPERCB(skb)->shapeclock-jiffies > SHAPER_LATENCY) {
 			dev_kfree_skb(skb);
 			shaper->stats.tx_dropped++;
 		} else