diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/netrom/af_netrom.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/netrom/af_netrom.c')
| -rw-r--r-- | net/netrom/af_netrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index ede50d197e10..71cf1bffea06 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c | |||
| @@ -1418,7 +1418,7 @@ static int __init nr_proto_init(void) | |||
| 1418 | struct net_device *dev; | 1418 | struct net_device *dev; |
| 1419 | 1419 | ||
| 1420 | sprintf(name, "nr%d", i); | 1420 | sprintf(name, "nr%d", i); |
| 1421 | dev = alloc_netdev(0, name, nr_setup); | 1421 | dev = alloc_netdev(0, name, NET_NAME_UNKNOWN, nr_setup); |
| 1422 | if (!dev) { | 1422 | if (!dev) { |
| 1423 | printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n"); | 1423 | printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n"); |
| 1424 | goto fail; | 1424 | goto fail; |