aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm/clip.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-11-19 05:32:12 -0500
committerJames Morris <james.l.morris@oracle.com>2014-11-19 05:32:12 -0500
commitb10778a00d40b3d9fdaaf5891e802794781ff71c (patch)
tree6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/atm/clip.c
parent594081ee7145cc30a3977cb4e218f81213b63dc5 (diff)
parentbfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff)
Merge commit 'v3.17' into next
Diffstat (limited to 'net/atm/clip.c')
-rw-r--r--net/atm/clip.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c
index ba291ce4bdff..46339040fef0 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -520,7 +520,8 @@ static int clip_create(int number)
520 if (PRIV(dev)->number >= number) 520 if (PRIV(dev)->number >= number)
521 number = PRIV(dev)->number + 1; 521 number = PRIV(dev)->number + 1;
522 } 522 }
523 dev = alloc_netdev(sizeof(struct clip_priv), "", clip_setup); 523 dev = alloc_netdev(sizeof(struct clip_priv), "", NET_NAME_UNKNOWN,
524 clip_setup);
524 if (!dev) 525 if (!dev)
525 return -ENOMEM; 526 return -ENOMEM;
526 clip_priv = PRIV(dev); 527 clip_priv = PRIV(dev);