From f1a963b10dba814ea48ff2bab431a8bfbb6499b4 Mon Sep 17 00:00:00 2001
From: Balaji G <balajig81@gmail.com>
Date: Tue, 29 Mar 2011 06:20:04 +0000
Subject: [PATCH] --- yaml --- r: 243552 b: refs/heads/master c:
 1459a3cc51d90d78027c7b5c1790e5d22751c8eb h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/bridge/br_stp_if.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 26755bd98ba1..03cc1a5d5dc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eec009548e98f6b6d514ff5bb8a8627b8dd17a49
+refs/heads/master: 1459a3cc51d90d78027c7b5c1790e5d22751c8eb
diff --git a/trunk/net/bridge/br_stp_if.c b/trunk/net/bridge/br_stp_if.c
index 5593f5aec942..9b61d09de9b9 100644
--- a/trunk/net/bridge/br_stp_if.c
+++ b/trunk/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 ||