From mboxrd@z Thu Jan 1 00:00:00 1970 From: Veaceslav Falico Subject: Re: [PATCH] bridge: Correctly clamp MAX forward_delay when enabling STP Date: Tue, 15 Oct 2013 21:17:11 +0200 Message-ID: <20131015191711.GC13150@redhat.com> References: <1381863465-27304-1-git-send-email-vyasevic@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Cc: netdev@vger.kernel.org, Herbert Xu , Stephen Hemminger To: Vlad Yasevich Return-path: Received: from mx1.redhat.com ([209.132.183.28]:24924 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757102Ab3JOTTX (ORCPT ); Tue, 15 Oct 2013 15:19:23 -0400 Content-Disposition: inline In-Reply-To: <1381863465-27304-1-git-send-email-vyasevic@redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, Oct 15, 2013 at 02:57:45PM -0400, Vlad Yasevich wrote: >Commit be4f154d5ef0ca147ab6bcd38857a774133f5450 > bridge: Clamp forward_delay when enabling STP >had a typo when attempting to clamp maximum forward delay. > >It is possible to set bridge_forward_delay to be higher then >permitted maximum when STP is off. When turning STP on, the >higher then allowed delay has to be clamed down to max value. > >CC: Herbert Xu >CC: Stephen Hemminger >Signed-off-by: Vlad Yasevich I think it should also be queued for stable, as it's present there also. David, mind adding it? As for the code - great catch! Reviewed-by: Veaceslav Falico >--- > net/bridge/br_stp_if.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c >index 108084a..656a6f3 100644 >--- a/net/bridge/br_stp_if.c >+++ b/net/bridge/br_stp_if.c >@@ -134,7 +134,7 @@ static void br_stp_start(struct net_bridge *br) > > if (br->bridge_forward_delay < BR_MIN_FORWARD_DELAY) > __br_set_forward_delay(br, BR_MIN_FORWARD_DELAY); >- else if (br->bridge_forward_delay < BR_MAX_FORWARD_DELAY) >+ else if (br->bridge_forward_delay > BR_MAX_FORWARD_DELAY) > __br_set_forward_delay(br, BR_MAX_FORWARD_DELAY); > > if (r == 0) { >-- >1.8.3.1 > >-- >To unsubscribe from this list: send the line "unsubscribe netdev" in >the body of a message to majordomo@vger.kernel.org >More majordomo info at http://vger.kernel.org/majordomo-info.html