net/mac80211/: Use time_* macros

The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values.

So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly

Cc: linux-wireless@vger.kernel.org
Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c
index c4678905a1421ed0e359e61022d53b7d95a4f74d..a669bcb8739f2cc29ba484f88b3ac0f2eb048a8a 100644 (file)
--- a/net/mac80211/rc80211_simple.c
+++ b/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/net/mac80211/rx.c b/net/mac80211/rx.c
index b1fc112152c9f2b0389d6f19810301f250d5cbcc..472b19fc9143385c7f853b3ecf36e7846b3f1aac 100644 (file)
--- a/net/mac80211/rx.c
+++ b/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;
                }