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/sched/sch_teql.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/sched/sch_teql.c')
| -rw-r--r-- | net/sched/sch_teql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 474167162947..bd33793b527e 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
| @@ -485,8 +485,8 @@ static int __init teql_init(void) | |||
| 485 | struct net_device *dev; | 485 | struct net_device *dev; |
| 486 | struct teql_master *master; | 486 | struct teql_master *master; |
| 487 | 487 | ||
| 488 | dev = alloc_netdev(sizeof(struct teql_master), | 488 | dev = alloc_netdev(sizeof(struct teql_master), "teql%d", |
| 489 | "teql%d", teql_master_setup); | 489 | NET_NAME_UNKNOWN, teql_master_setup); |
| 490 | if (!dev) { | 490 | if (!dev) { |
| 491 | err = -ENOMEM; | 491 | err = -ENOMEM; |
| 492 | break; | 492 | break; |