summaryrefslogtreecommitdiffstats
path: root/net/openvswitch/datapath.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-07 22:49:01 -0800
committerDavid S. Miller <davem@davemloft.net>2012-03-07 22:49:01 -0800
commit9259c483a34a4efbaf60583af3719bed28a3fe45 (patch)
tree5e3dbac4aeabd5bf83970cb8a2b642c2009a34d4 /net/openvswitch/datapath.c
parentd47775c4a7a40ecd048400cf770504ad1f2cd3df (diff)
parent81e5d41d7ed4f6c61ba3d2414f4f9ddf6d934ebb (diff)
downloadblackbird-op-linux-9259c483a34a4efbaf60583af3719bed28a3fe45.tar.gz
blackbird-op-linux-9259c483a34a4efbaf60583af3719bed28a3fe45.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Diffstat (limited to 'net/openvswitch/datapath.c')
-rw-r--r--net/openvswitch/datapath.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index ce64c18b8c79..2c030505b335 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]);
OpenPOWER on IntegriCloud