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/bridge/br_if.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/bridge/br_if.c')
| -rw-r--r-- | net/bridge/br_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 3eca3fdf8fe1..078d336a1f37 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
| @@ -344,7 +344,7 @@ int br_add_bridge(struct net *net, const char *name) | |||
| 344 | struct net_device *dev; | 344 | struct net_device *dev; |
| 345 | int res; | 345 | int res; |
| 346 | 346 | ||
| 347 | dev = alloc_netdev(sizeof(struct net_bridge), name, | 347 | dev = alloc_netdev(sizeof(struct net_bridge), name, NET_NAME_UNKNOWN, |
| 348 | br_dev_setup); | 348 | br_dev_setup); |
| 349 | 349 | ||
| 350 | if (!dev) | 350 | if (!dev) |