summaryrefslogtreecommitdiff
path: root/drivers/net/loopback.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-21 15:23:58 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-21 15:23:58 -0500
commit2871f352c600d36b1b8ba57c79029cf8aa512948 (patch)
tree64e6da828a9e1a0c9dc4fbe45a1172e689a22deb /drivers/net/loopback.c
parent0f3bf3dc1ca394a8385079a5653088672b65c5c4 (diff)
parent7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff)
Merge tag 'v3.17-rc1' into patchwork
Linux 3.17-rc1
Diffstat (limited to 'drivers/net/loopback.c')
-rw-r--r--drivers/net/loopback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index bb96409f8c05..8f2262540561 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -195,7 +195,7 @@ static __net_init int loopback_net_init(struct net *net)
int err;
err = -ENOMEM;
- dev = alloc_netdev(0, "lo", loopback_setup);
+ dev = alloc_netdev(0, "lo", NET_NAME_UNKNOWN, loopback_setup);
if (!dev)
goto out;