diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-25 22:43:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-25 22:43:59 -0400 |
| commit | dfe98e9214ced45cd1a6ecd19f2627819a630f77 (patch) | |
| tree | 4a229937bc32c470ebb75a51bdd39572d91ac0ce /drivers/net/veth.c | |
| parent | f89e6e3834035c6e8203042f3527931aa7f52496 (diff) | |
| parent | 878628fbf2589eb24357e42027d5f54b1dafd3c8 (diff) | |
Merge branch 'net-2.6.26-netns-20080326' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
Diffstat (limited to 'drivers/net/veth.c')
| -rw-r--r-- | drivers/net/veth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index e2ad98bee6e7..31cd817f33f9 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c | |||
| @@ -375,7 +375,7 @@ static int veth_newlink(struct net_device *dev, | |||
| 375 | else | 375 | else |
| 376 | snprintf(ifname, IFNAMSIZ, DRV_NAME "%%d"); | 376 | snprintf(ifname, IFNAMSIZ, DRV_NAME "%%d"); |
| 377 | 377 | ||
| 378 | peer = rtnl_create_link(dev->nd_net, ifname, &veth_link_ops, tbp); | 378 | peer = rtnl_create_link(dev_net(dev), ifname, &veth_link_ops, tbp); |
| 379 | if (IS_ERR(peer)) | 379 | if (IS_ERR(peer)) |
| 380 | return PTR_ERR(peer); | 380 | return PTR_ERR(peer); |
| 381 | 381 | ||