From: Julia Lawall <[EMAIL PROTECTED]> The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values.
A simplified version of the semantic patch making this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @ change_compare_np @ expression E; @@ ( - jiffies <= E + time_before_eq(jiffies,E) | - jiffies >= E + time_after_eq(jiffies,E) | - jiffies < E + time_before(jiffies,E) | - jiffies > E + time_after(jiffies,E) ) @ include depends on change_compare_np @ @@ #include <linux/jiffies.h> @ no_include depends on !include && change_compare_np @ @@ #include <linux/...> + #include <linux/jiffies.h> // </smpl> Signed-off-by: Julia Lawall <[EMAIL PROTECTED]> --- diff -r -u -p a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c --- a/net/mac80211/rc80211_simple.c 2007-11-13 16:01:34.000000000 +0100 +++ b/net/mac80211/rc80211_simple.c 2007-12-23 20:30:40.000000000 +0100 @@ -13,6 +13,7 @@ #include <linux/slab.h> #include <linux/skbuff.h> #include <linux/compiler.h> +#include <linux/jiffies.h> #include <net/mac80211.h> #include "ieee80211_i.h" @@ -194,7 +195,7 @@ static void rate_control_simple_tx_statu 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 -r -u -p a/net/mac80211/rx.c b/net/mac80211/rx.c --- a/net/mac80211/rx.c 2007-12-04 13:19:55.000000000 +0100 +++ b/net/mac80211/rx.c 2007-12-23 20:30:40.000000000 +0100 @@ -14,6 +14,7 @@ #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/rcupdate.h> +#include <linux/jiffies.h> #include <net/mac80211.h> #include <net/ieee80211_radiotap.h> @@ -741,7 +742,7 @@ ieee80211_reassemble_find(struct ieee802 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; } -- 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/
