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/dsa/slave.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/dsa/slave.c')
| -rw-r--r-- | net/dsa/slave.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 64c5af0a10dd..45a1e34c89e0 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c | |||
| @@ -340,8 +340,8 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent, | |||
| 340 | struct dsa_slave_priv *p; | 340 | struct dsa_slave_priv *p; |
| 341 | int ret; | 341 | int ret; |
| 342 | 342 | ||
| 343 | slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv), | 343 | slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv), name, |
| 344 | name, ether_setup); | 344 | NET_NAME_UNKNOWN, ether_setup); |
| 345 | if (slave_dev == NULL) | 345 | if (slave_dev == NULL) |
| 346 | return slave_dev; | 346 | return slave_dev; |
| 347 | 347 | ||