[PATCH 09/14] net/mac80211/: Use time_* macros

[S . Çağlar Onur]

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: [EMAIL PROTECTED]
Signed-off-by: S.Çağlar Onur <[EMAIL PROTECTED]>
---
 net/mac80211/rc80211_simple.c |3 ++-
 net/mac80211/rx.c |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c
index 9a78b11..91bbff1 100644
--- a/net/mac80211/rc80211_simple.c
+++ b/net/mac80211/rc80211_simple.c
@@ -7,6 +7,7 @@
  * published by the Free Software Foundation.
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -177,7 +178,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 535407d..592581a 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -801,7 +802,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(>skb_list);
continue;
}
-- 
1.5.3.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 09/14] net/mac80211/: Use time_* macros

[S . Çağlar Onur]

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: [EMAIL PROTECTED]
Signed-off-by: S.Çağlar Onur [EMAIL PROTECTED]
---
 net/mac80211/rc80211_simple.c |3 ++-
 net/mac80211/rx.c |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c
index 9a78b11..91bbff1 100644
--- 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
@@ -177,7 +178,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 535407d..592581a 100644
--- 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
@@ -801,7 +802,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;
}
-- 
1.5.3.7

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/