[PATCH 2.6 4/4]: ipt: convert jiffie values to USER_HZ when dumping

[PATCH 2.6 4/4]: ipt: convert jiffie values to USER_HZ when dumping

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 50 bytes --]

Convert jiffie values to USER_HZ in ipt action.



[-- Attachment #2: 4.diff --]
[-- Type: text/x-patch, Size: 1111 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/11/05 00:17:18+01:00 kaber@coreworks.de 
#   [PKT_SCHED]: ipt: convert jiffie values to USER_HZ when dumping
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
# net/sched/ipt.c
#   2004/11/05 00:17:10+01:00 kaber@coreworks.de +3 -3
#   [PKT_SCHED]: ipt: convert jiffie values to USER_HZ when dumping
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
diff -Nru a/net/sched/ipt.c b/net/sched/ipt.c
--- a/net/sched/ipt.c	2004-11-05 00:19:01 +01:00
+++ b/net/sched/ipt.c	2004-11-05 00:19:01 +01:00
@@ -334,9 +334,9 @@
 	RTA_PUT(skb, TCA_IPT_HOOK, 4, &p->hook);
 	RTA_PUT(skb, TCA_IPT_CNT, sizeof(struct tc_cnt), &c);
 	RTA_PUT(skb, TCA_IPT_TABLE, IFNAMSIZ, p->tname);
-	tm.install = jiffies - p->tm.install;
-	tm.lastuse = jiffies - p->tm.lastuse;
-	tm.expires = p->tm.expires;
+	tm.install = jiffies_to_clock_t(jiffies - p->tm.install);
+	tm.lastuse = jiffies_to_clock_t(jiffies - p->tm.lastuse);
+	tm.expires = jiffies_to_clock_t(p->tm.expires);
 	RTA_PUT(skb, TCA_IPT_TM, sizeof (tm), &tm);
 	return skb->len;
 

Re: [PATCH 2.6 4/4]: ipt: convert jiffie values to USER_HZ when dumping

[David S. Miller]

All 4 patches applied, thanks Patrick.

BTW, you don't need to split up changes like this with such high
granularity.  It's perfectly fine to lump these kinds of simple
changes together as "Convert to USER_HZ when dumping in TC action
modules".

If the transformation is sizable or of non-trivial complexity, then
yes splitting up the individual changes makes sense and makes it easier
for people to review and verify the patches.

Just a FYI. :-)