netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bridge: return value for br_stp_recalculate_bridge_id()
@ 2011-03-30  6:23 Dongdong Deng
  2011-03-30  6:27 ` Stephen Hemminger
  2011-03-31 17:38 ` [Bridge] " Stephen Hemminger
  0 siblings, 2 replies; 4+ messages in thread
From: Dongdong Deng @ 2011-03-30  6:23 UTC (permalink / raw)
  To: davem, shemminger; +Cc: netdev, bridge, dongdong.deng

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@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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-03-31 22:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-30  6:23 [PATCH] bridge: return value for br_stp_recalculate_bridge_id() Dongdong Deng
2011-03-30  6:27 ` Stephen Hemminger
2011-03-31 17:38 ` [Bridge] " Stephen Hemminger
2011-03-31 22:31   ` Andrew Morton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).