Dongdong Deng
2011-Mar-30 06:23 UTC
[Bridge] [PATCH] bridge: return value for br_stp_recalculate_bridge_id()
Return 'false' for "user has set a mac addr" case in
br_stp_recalculate_bridge_id() function.
and this could address the following build warning:
net/bridge/br_stp_if.c: In function br_stp_recalculate_bridge_id:
net/bridge/br_stp_if.c:216: warning: return with no value, in function
returning non-void
Signed-off-by: Dongdong Deng <dongdong.deng at windriver.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.6.0.4
Stephen Hemminger
2011-Mar-30 06:27 UTC
[Bridge] [PATCH] bridge: return value for br_stp_recalculate_bridge_id()
On Wed, 30 Mar 2011 14:23:27 +0800 Dongdong Deng <dongdong.deng at windriver.com> wrote:> Return 'false' for "user has set a mac addr" case in > br_stp_recalculate_bridge_id() function. > > and this could address the following build warning: > > net/bridge/br_stp_if.c: In function br_stp_recalculate_bridge_id: > net/bridge/br_stp_if.c:216: warning: return with no value, in function > returning non-void > > Signed-off-by: Dongdong Deng <dongdong.deng at windriver.com>Patch has already been submitted and acke'd for this.