---

yaml --- r: 243552 b: refs/heads/master c: 1459a3c h: refs/heads/master v: v3
git-mirror · Mar 30, 2011 · f1a963b · f1a963b
1 parent 640cefb
commit f1a963b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 ||