summaryrefslogtreecommitdiffstats
path: root/net/openvswitch/vport-netdev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-09-04 15:22:28 -0400
committerDavid S. Miller <davem@davemloft.net>2012-09-04 15:22:28 -0400
commitcefd81cfeca14ec4c63cc748441634f1d4c0eb3f (patch)
treeb4541c563d40c4600e79319c2e98919caa19cede /net/openvswitch/vport-netdev.c
parent3731a334c012ed825a87e1f152bbf980f79dabb2 (diff)
parent15eac2a74277bc7de68a7c2a64a7c91b4b6f5961 (diff)
downloadop-kernel-dev-cefd81cfeca14ec4c63cc748441634f1d4c0eb3f.zip
op-kernel-dev-cefd81cfeca14ec4c63cc748441634f1d4c0eb3f.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Diffstat (limited to 'net/openvswitch/vport-netdev.c')
-rw-r--r--net/openvswitch/vport-netdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c
index 6ea3551..3c1e58b 100644
--- a/net/openvswitch/vport-netdev.c
+++ b/net/openvswitch/vport-netdev.c
@@ -83,7 +83,7 @@ static struct vport *netdev_create(const struct vport_parms *parms)
netdev_vport = netdev_vport_priv(vport);
- netdev_vport->dev = dev_get_by_name(&init_net, parms->name);
+ netdev_vport->dev = dev_get_by_name(ovs_dp_get_net(vport->dp), parms->name);
if (!netdev_vport->dev) {
err = -ENODEV;
goto error_free_vport;
OpenPOWER on IntegriCloud