Merge commit 'v3.17' into next

2 files changed, 3 insertions, 2 deletions

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index bfcf6be1d665..c00897f65a31 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1805,7 +1805,7 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 long amount = 0;
 
                 if (skb)
-                amount = skb->len - sizeof(struct ddpehdr);
+                        amount = skb->len - sizeof(struct ddpehdr);
                 rc = put_user(amount, (int __user *)argp);
                 break;
         }
diff --git a/net/appletalk/dev.c b/net/appletalk/dev.c
index 6c8016f61866..e4158b8b926d 100644
--- a/net/appletalk/dev.c
+++ b/net/appletalk/dev.c
@@ -39,6 +39,7 @@ static void ltalk_setup(struct net_device *dev)
 
 struct net_device *alloc_ltalkdev(int sizeof_priv)
 {
-        return alloc_netdev(sizeof_priv, "lt%d", ltalk_setup);
+        return alloc_netdev(sizeof_priv, "lt%d", NET_NAME_UNKNOWN,
+                            ltalk_setup);
 }
 EXPORT_SYMBOL(alloc_ltalkdev);