diff options
author | David S. Miller <davem@davemloft.net> | 2017-11-11 19:17:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-11 19:17:05 -0500 |
commit | fdae5f37a88caed9d2105f5a1ff609322f9e5416 (patch) | |
tree | 086808d640803b16286a318eb4d0895006de5c19 /net/dsa/switch.c | |
parent | 7c5556decd0a629e9ee02e93653f75ba7b7da03c (diff) | |
parent | b39545684a90ef3374abc0969d64c7bc540d128d (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/dsa/switch.c')
-rw-r--r-- | net/dsa/switch.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/dsa/switch.c b/net/dsa/switch.c index 1155e43c157f..29608d087a7c 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, | |||
133 | if (err) | 133 | if (err) |
134 | return err; | 134 | return err; |
135 | } | 135 | } |
136 | |||
137 | return 0; | ||
136 | } | 138 | } |
137 | 139 | ||
138 | for_each_set_bit(port, group, ds->num_ports) | 140 | for_each_set_bit(port, group, ds->num_ports) |
@@ -180,6 +182,8 @@ static int dsa_switch_vlan_add(struct dsa_switch *ds, | |||
180 | if (err) | 182 | if (err) |
181 | return err; | 183 | return err; |
182 | } | 184 | } |
185 | |||
186 | return 0; | ||
183 | } | 187 | } |
184 | 188 | ||
185 | for_each_set_bit(port, members, ds->num_ports) | 189 | for_each_set_bit(port, members, ds->num_ports) |