git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
shaper.c
diff --git
a/drivers/net/shaper.c
b/drivers/net/shaper.c
index
88e2120
..
221354e
100644
(file)
--- 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/if_arp.h>
#include <linux/init.h>
#include <linux/if_shaper.h>
-#include <linux/jiffies.h>
#include <net/dst.h>
#include <net/arp.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.
*/
/*
* 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
dev_kfree_skb(skb);
shaper->stats.tx_dropped++;
} else