From 4b5d04444fce950042964a3cfaed756a4c80d88a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= <caglar@pardus.org.tr>
Date: Thu, 14 Feb 2008 17:36:47 +0200
Subject: [PATCH] --- yaml --- r: 89910 b: refs/heads/master c:
 ab46623ec1f4ea022b861333ce959f0b8f9eb70e h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/net/mac80211/rc80211_simple.c | 3 ++-
 trunk/net/mac80211/rx.c             | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4fe5c3f05dde..1297e0cd1027 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac2bf3242e1a329543be50b5c9df4f0119ee188c
+refs/heads/master: ab46623ec1f4ea022b861333ce959f0b8f9eb70e
diff --git a/trunk/net/mac80211/rc80211_simple.c b/trunk/net/mac80211/rc80211_simple.c
index c4678905a142..a669bcb8739f 100644
--- a/trunk/net/mac80211/rc80211_simple.c
+++ b/trunk/net/mac80211/rc80211_simple.c
@@ -7,6 +7,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/jiffies.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/types.h>
@@ -175,7 +176,7 @@ static void rate_control_simple_tx_status(void *priv, struct net_device *dev,
 		rate_control_rate_dec(local, sta);
 	}
 
-	if (srctrl->avg_rate_update + 60 * HZ < jiffies) {
+	if (time_after(jiffies, srctrl->avg_rate_update + 60 * HZ)) {
 		srctrl->avg_rate_update = jiffies;
 		if (srctrl->tx_avg_rate_num > 0) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index b1fc112152c9..472b19fc9143 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
@@ -767,7 +768,7 @@ ieee80211_reassemble_find(struct ieee80211_sub_if_data *sdata,
 		    compare_ether_addr(hdr->addr2, f_hdr->addr2) != 0)
 			continue;
 
-		if (entry->first_frag_time + 2 * HZ < jiffies) {
+		if (time_after(jiffies, entry->first_frag_time + 2 * HZ)) {
 			__skb_queue_purge(&entry->skb_list);
 			continue;
 		}