2011-04-01 04:24:40

by Liu Yuan

Subject: [PATCH] net/bridge: Fix wrong return-no-vaule

From: Liu Yuan <[email protected]>

In br_stp_if.c/br_stp_recalculate_bridge_id, it should return
false, which indicates that there is no change when we find
that user has chosen a value.

Signed-off-by: Liu Yuan <[email protected]>
---
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.7.1

2011-04-01 18:11:26

by Sasikantha Babu

Subject: Re: [Bridge] [PATCH] net/bridge: Fix wrong return-no-vaule

It is already fixed and applied

On 4/1/11, [email protected] <[email protected]> wrote:
> From: Liu Yuan <[email protected]>
>
> In br_stp_if.c/br_stp_recalculate_bridge_id, it should return
> false, which indicates that there is no change when we find
> that user has chosen a value.
>
> Signed-off-by: Liu Yuan <[email protected]>
> ---
> 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.7.1
>
> _______________________________________________
> Bridge mailing list
> [email protected]
> https://lists.linux-foundation.org/mailman/listinfo/bridge
>