summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalaji G <balajig81@gmail.com>2011-03-29 06:20:04 +0000
committerDavid S. Miller <davem@davemloft.net>2011-03-29 23:37:23 -0700
commit1459a3cc51d90d78027c7b5c1790e5d22751c8eb (patch)
treec8c1f1a12c0001e55ed27f904dcef490040bd4ab
parenteec009548e98f6b6d514ff5bb8a8627b8dd17a49 (diff)
downloadlinux-3.10-1459a3cc51d90d78027c7b5c1790e5d22751c8eb.tar.gz
linux-3.10-1459a3cc51d90d78027c7b5c1790e5d22751c8eb.tar.bz2
linux-3.10-1459a3cc51d90d78027c7b5c1790e5d22751c8eb.zip
bridge: Fix compilation warning in function br_stp_recalculate_bridge_id()
net/bridge/br_stp_if.c: In function ‘br_stp_recalculate_bridge_id’: net/bridge/br_stp_if.c:216:3: warning: ‘return’ with no value, in function returning non-void Signed-off-by: G.Balaji <balajig81@gmail.com> Acked-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bridge/br_stp_if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 5593f5aec94..9b61d09de9b 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 ||