From: Rich Lane <rlane@bigswitch.com>
Date: Fri, 8 Feb 2013 17:11:28 +0000 (-0800)
Subject: datapath: Fix ovs_vport_cmd_del return value on success
X-Git-Tag: sliver-openvswitch-1.10.90-1~11^2~69
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b57d5819ca17da7eb237e5f9343c780937776438;p=sliver-openvswitch.git

datapath: 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>
---

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 86ceb9f80..f78c23255 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -2064,6 +2064,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,