From: Joakim Tjernlund Date: Thu, 1 Mar 2012 08:12:18 +0000 (+0000) Subject: bridge: Adjust min age inc for HZ > 256 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=aaca735f4f188641c4786af8f20ed39fcce3809c;p=~shefty%2Frdma-dev.git bridge: Adjust min age inc for HZ > 256 min age increment needs to round up its min age tick for all HZ values to guarantee message age is increasing. Signed-off-by: Joakim Tjernlund Signed-off-by: David S. Miller --- diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index dd147d78a58..c9ef3db737d 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -17,9 +17,9 @@ #include "br_private_stp.h" /* since time values in bpdu are in jiffies and then scaled (1/256) - * before sending, make sure that is at least one. + * before sending, make sure that is at least one STP tick. */ -#define MESSAGE_AGE_INCR ((HZ < 256) ? 1 : (HZ/256)) +#define MESSAGE_AGE_INCR ((HZ / 256) + 1) static const char *const br_port_state_names[] = { [BR_STATE_DISABLED] = "disabled",