Merge commit 'v3.17' into next

1 files changed, 1 insertions, 1 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;
         }