diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-03-06 15:04:04 -0800 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2012-03-06 15:04:04 -0800 |
| commit | 651a68ea2ce9738b84e928836053b2e0fb5db2ba (patch) | |
| tree | 1584b5b2c3180745483bd6587bb435178cf0651d /net | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| download | linux-3.10-651a68ea2ce9738b84e928836053b2e0fb5db2ba.tar.gz linux-3.10-651a68ea2ce9738b84e928836053b2e0fb5db2ba.tar.bz2 linux-3.10-651a68ea2ce9738b84e928836053b2e0fb5db2ba.zip | |
openvswitch: Honor dp_ifindex, when specified, for vport lookup by name.
When OVS_VPORT_ATTR_NAME is specified and dp_ifindex is nonzero, the
logical behavior would be for the vport name lookup scope to be limited
to the specified datapath, but in fact the dp_ifindex value was ignored.
This commit causes the search scope to be honored.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/openvswitch/datapath.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index ce64c18b8c7..2c030505b33 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1521,6 +1521,9 @@ static struct vport *lookup_vport(struct ovs_header *ovs_header, vport = ovs_vport_locate(nla_data(a[OVS_VPORT_ATTR_NAME])); if (!vport) return ERR_PTR(-ENODEV); + if (ovs_header->dp_ifindex && + ovs_header->dp_ifindex != get_dpifindex(vport->dp)) + return ERR_PTR(-ENODEV); return vport; } else if (a[OVS_VPORT_ATTR_PORT_NO]) { u32 port_no = nla_get_u32(a[OVS_VPORT_ATTR_PORT_NO]); |