aboutsummaryrefslogtreecommitdiff
path: root/net/openvswitch
diff options
context:
space:
mode:
authorRich Lane <rlane@bigswitch.com>2013-02-08 09:30:23 -0800
committerJesse Gross <jesse@nicira.com>2013-02-22 17:01:49 -0800
commit734907e82d21a75a514b80164185427a832a00c0 (patch)
tree6b8dbf9a592689862464581e1f70c21b1b0c0b52 /net/openvswitch
parent19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff)
downloadlinux-734907e82d21a75a514b80164185427a832a00c0.tar.gz
openvswitch: Fix ovs_vport_cmd_del return value on success
If the pointer does not represent an error then the PTR_ERR macro may still return a nonzero value. The fix is the same as in ovs_vport_cmd_set. Signed-off-by: Rich Lane <rlane@bigswitch.com> Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/datapath.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index f996db34324..5e275b903f3 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1772,6 +1772,7 @@ static int ovs_vport_cmd_del(struct sk_buff *skb, struct genl_info *info)
if (IS_ERR(reply))
goto exit_unlock;
+ err = 0;
ovs_dp_detach_port(vport);
genl_notify(reply, genl_info_net(info), info->snd_portid,