Merge commit 'v3.17' into next

2 files changed, 3 insertions, 4 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 5db37cef50a9..0a49632fac47 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -351,8 +351,7 @@ static void dsa_of_free_platform_data(struct dsa_platform_data *pd)
         for (i = 0; i < pd->nr_chips; i++) {
                 port_index = 0;
                 while (port_index < DSA_MAX_PORTS) {
-                        if (pd->chip[i].port_names[port_index])
-                                kfree(pd->chip[i].port_names[port_index]);
+                        kfree(pd->chip[i].port_names[port_index]);
                         port_index++;
                 }
                 kfree(pd->chip[i].rtable);
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 64c5af0a10dd..45a1e34c89e0 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -340,8 +340,8 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent,
         struct dsa_slave_priv *p;
         int ret;
 
-        slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv),
-                                 name, ether_setup);
+        slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv), name,
+                                 NET_NAME_UNKNOWN, ether_setup);
         if (slave_dev == NULL)
                 return slave_dev;