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

2017-02-11 02:31:11 -05:00
parent bed45f79a2 1ee18329fa
commit 35eeacf182
97 changed files with 863 additions and 351 deletions
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -271,6 +271,7 @@ static int dsa_user_port_apply(struct dsa_port *port, u32 index,
 	if (err) {
 		dev_warn(ds->dev, "Failed to create slave %d: %d\n",
 			 index, err);
+		ds->ports[index].netdev = NULL;
 		return err;
 	}