From: Ben Pfaff Date: Fri, 30 Aug 2013 03:55:10 +0000 (-0700) Subject: ofproto-dpif: Do not dpif_port_del() patch ports in port_del(). X-Git-Tag: v2.0~85 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=059ba5813e9e711b1a0dbc34ea7cbe9d360e31a6;hp=c9dad52a818693e5d5eb75891db9e6f0a5053886;p=cascardo%2Fovs.git ofproto-dpif: Do not dpif_port_del() patch ports in port_del(). Patch ports don't have datapath ports so it doesn't make sense to try to call dpif_port_del() on them. If we do try, it will fail, which makes the caller think that the port wasn't really deleted, which in turn keeps ofproto from reporting the port deletion via OpenFlow. This fixes the problem. Without this patch, the following commands, executed under "make sandbox", will report the patch port addition in "ovs-ofctl monitor" output, but not the patch port deletion. With this patch, both the addition and deletion will be reported. ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev ovs-ofctl monitor br0 128 & ovs-vsctl add-port br0 patch1 \ -- set interface patch1 type=patch options:peer=patch2 \ -- add-port br0 patch2 \ -- set interface patch2 type=patch options:peer=patch1 ovs-vsctl del-port patch1 ovs-vsctl del-port patch2 Reported-by: YAMAMOTO Takashi Signed-off-by: Ben Pfaff --- diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 58a4d94a4..ed14600af 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -3120,7 +3120,7 @@ port_del(struct ofproto *ofproto_, ofp_port_t ofp_port) sset_find_and_delete(&ofproto->ghost_ports, netdev_get_name(ofport->up.netdev)); ofproto->backer->need_revalidate = REV_RECONFIGURE; - if (!ofport->is_tunnel) { + if (!ofport->is_tunnel && !netdev_vport_is_patch(ofport->up.netdev)) { error = dpif_port_del(ofproto->backer->dpif, ofport->odp_port); if (!error) { /* The caller is going to close ofport->up.netdev. If this is a