[PATCH 2/2] bridge: round off STP perodic timers

[Stephen Hemminger <shemminger@linux-foundation.org>]

Peroidic STP timers don't have to be exact.
The hold timer runs at 1HZ, and the hello timer normally runs
at 2HZ; save power by aligning it them to next second.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>

---
 net/bridge/br_stp.c       |    3 ++-
 net/bridge/br_stp_timer.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- a/net/bridge/br_stp.c	2007-05-30 11:42:16.000000000 -0700
+++ b/net/bridge/br_stp.c	2007-05-30 11:51:51.000000000 -0700
@@ -178,7 +178,8 @@ void br_transmit_config(struct net_bridg
 		br_send_config_bpdu(p, &bpdu);
 		p->topology_change_ack = 0;
 		p->config_pending = 0;
-		mod_timer(&p->hold_timer, jiffies + BR_HOLD_TIME);
+		mod_timer(&p->hold_timer,
+			  round_jiffies(jiffies + BR_HOLD_TIME));
 	}
 }
 
--- a/net/bridge/br_stp_timer.c	2007-05-30 11:42:16.000000000 -0700
+++ b/net/bridge/br_stp_timer.c	2007-05-30 11:53:08.000000000 -0700
@@ -42,7 +42,7 @@ static void br_hello_timer_expired(unsig
 	if (br->dev->flags & IFF_UP) {
 		br_config_bpdu_generation(br);
 
-		mod_timer(&br->hello_timer, jiffies + br->hello_time);
+		mod_timer(&br->hello_timer, round_jiffies(jiffies + br->hello_time));
 	}
 	spin_unlock(&br->lock);
 }