diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 19:19:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 19:19:20 -0500 |
| commit | 03a49eebcaa3486f4ac2c50db83aab996ce5ad9b (patch) | |
| tree | a92d8a6b3806ec3416ca2b28c45174fca9c4833e /drivers/net/wireless | |
| parent | d4fbeabbc9e68c80738fe59135d201c3ed5fe40f (diff) | |
| parent | 26df54bffd90977fbc6fe8284f2beaed19fea44f (diff) | |
| download | blackbird-op-linux-03a49eebcaa3486f4ac2c50db83aab996ce5ad9b.tar.gz blackbird-op-linux-03a49eebcaa3486f4ac2c50db83aab996ce5ad9b.zip | |
Merge branch 'janitor'
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/strip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index 18baacfc5a2c..18a44580b53b 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c @@ -112,7 +112,7 @@ static const char StripVersion[] = "1.3A-STUART.CHESHIRE"; #include <linux/ip.h> #include <linux/tcp.h> #include <linux/time.h> - +#include <linux/jiffies.h> /************************************************************************/ /* Useful structures and definitions */ @@ -1569,7 +1569,7 @@ static int strip_xmit(struct sk_buff *skb, struct net_device *dev) del_timer(&strip_info->idle_timer); - if (jiffies - strip_info->pps_timer > HZ) { + if (time_after(jiffies, strip_info->pps_timer + HZ)) { unsigned long t = jiffies - strip_info->pps_timer; unsigned long rx_pps_count = (strip_info->rx_pps_count * HZ * 8 + t / 2) / t; unsigned long tx_pps_count = (strip_info->tx_pps_count * HZ * 8 + t / 2) / t; |
