diff mbox series

[net-next,2/6] net: dsa: return after mdb prepare phase

Message ID 20171108171917.5965-3-vivien.didelot@savoirfairelinux.com
State Changes Requested, archived
Delegated to: David Miller
Headers show
Series net: dsa: simplify switchdev prepare phase | expand

Commit Message

Vivien Didelot Nov. 8, 2017, 5:19 p.m. UTC
The current code does not return after successfully preparing the MDB
addition on every ports member of a multicast group. Fix this.

Fixes: a1a6b7ea7f2d ("net: dsa: add cross-chip multicast support")
Reported-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
 net/dsa/switch.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Egil Hjelmeland Nov. 9, 2017, 8:48 a.m. UTC | #1
On 08. nov. 2017 18:19, Vivien Didelot wrote:
> The current code does not return after successfully preparing the MDB
> addition on every ports member of a multicast group. Fix this.
> 
> Fixes: a1a6b7ea7f2d ("net: dsa: add cross-chip multicast support")
> Reported-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
> Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
> ---
>   net/dsa/switch.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/net/dsa/switch.c b/net/dsa/switch.c
> index 04e8ad2c3d5d..0041aba5c339 100644
> --- a/net/dsa/switch.c
> +++ b/net/dsa/switch.c
> @@ -133,6 +133,8 @@ static int dsa_switch_mdb_add(struct dsa_switch *ds,
>   			if (err)
>   				return err;
>   		}
> +
> +		return 0;
>   	}
>   
>   	for_each_set_bit(port, group, ds->num_ports)
> 

Hi Vivien!

Will this cause a merge-conflict with the "net" patch you sent, when 
"net" is merged to "net-next"? Perhaps more polite to hold on to this 
(and following patches) until "net" patch has trickled through the system?

Regards
Egil
diff mbox series

Patch

diff --git a/net/dsa/switch.c b/net/dsa/switch.c
index 04e8ad2c3d5d..0041aba5c339 100644
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
@@ -133,6 +133,8 @@  static int dsa_switch_mdb_add(struct dsa_switch *ds,
 			if (err)
 				return err;
 		}
+
+		return 0;
 	}
 
 	for_each_set_bit(port, group, ds->num_ports)