Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-12 09:17:05 +09:00
parent 7c5556decd b39545684a
commit fdae5f37a8
37 changed files with 180 additions and 105 deletions
--- 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)
@ -180,6 +182,8 @@ static int dsa_switch_vlan_add(struct dsa_switch *ds,
 			if (err)
 				return err;
 		}
+
+		return 0;
 	}

 	for_each_set_bit(port, members, ds->num_ports)