namei.unix at gmail.com
2011-Apr-01 04:24 UTC
[Bridge] [PATCH] net/bridge: Fix wrong return-no-vaule
From: Liu Yuan <tailai.ly at taobao.com>
In br_stp_if.c/br_stp_recalculate_bridge_id, it should return
false, which indicates that there is no change when we find
that user has chosen a value.
Signed-off-by: Liu Yuan <tailai.ly at taobao.com>
---
net/bridge/br_stp_if.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 5593f5a..9b61d09 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -213,7 +213,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
/* user has chosen a value so keep it */
if (br->flags & BR_SET_MAC_ADDR)
- return;
+ return false;
list_for_each_entry(p, &br->port_list, list) {
if (addr == br_mac_zero ||
--
1.7.1
It is already fixed and applied On 4/1/11, namei.unix at gmail.com <namei.unix at gmail.com> wrote:> From: Liu Yuan <tailai.ly at taobao.com> > > In br_stp_if.c/br_stp_recalculate_bridge_id, it should return > false, which indicates that there is no change when we find > that user has chosen a value. > > Signed-off-by: Liu Yuan <tailai.ly at taobao.com> > --- > net/bridge/br_stp_if.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c > index 5593f5a..9b61d09 100644 > --- a/net/bridge/br_stp_if.c > +++ b/net/bridge/br_stp_if.c > @@ -213,7 +213,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br) > > /* user has chosen a value so keep it */ > if (br->flags & BR_SET_MAC_ADDR) > - return; > + return false; > > list_for_each_entry(p, &br->port_list, list) { > if (addr == br_mac_zero || > -- > 1.7.1 > > _______________________________________________ > Bridge mailing list > Bridge at lists.linux-foundation.org > https://lists.linux-foundation.org/mailman/listinfo/bridge >