diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-04 15:22:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-04 15:22:28 -0400 |
| commit | cefd81cfeca14ec4c63cc748441634f1d4c0eb3f (patch) | |
| tree | b4541c563d40c4600e79319c2e98919caa19cede /net/openvswitch/vport-netdev.c | |
| parent | 3731a334c012ed825a87e1f152bbf980f79dabb2 (diff) | |
| parent | 15eac2a74277bc7de68a7c2a64a7c91b4b6f5961 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c index 6ea3551cc78c..3c1e58ba714b 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) | |||
| 83 | 83 | ||
| 84 | netdev_vport = netdev_vport_priv(vport); | 84 | netdev_vport = netdev_vport_priv(vport); |
| 85 | 85 | ||
| 86 | netdev_vport->dev = dev_get_by_name(&init_net, parms->name); | 86 | netdev_vport->dev = dev_get_by_name(ovs_dp_get_net(vport->dp), parms->name); |
| 87 | if (!netdev_vport->dev) { | 87 | if (!netdev_vport->dev) { |
| 88 | err = -ENODEV; | 88 | err = -ENODEV; |
| 89 | goto error_free_vport; | 89 | goto error_free_vport; |