X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fbridge%2Fbr_stp.c;h=9e96ffcd29a34f7bd80191fb22326a6eb49d8f11;hb=7e2225d860772aaa07e1cebca6a5aa6f93f9aa91;hp=ebb0861e9bd573959eb2a4c1bdb7ef00cbcc3454;hpb=b643b0fdbc59cf6bbb086974b29d2571e9e9f646;p=linux-2.6

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index ebb0861e9b..9e96ffcd29 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -13,7 +13,7 @@
  *	2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
-#include <linux/smp_lock.h>
+#include <linux/rculist.h>
 
 #include "br_private.h"
 #include "br_private_stp.h"
@@ -179,7 +179,8 @@ void br_transmit_config(struct net_bridge_port *p)
 		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));
 	}
 }