From: Rich Lane <rlane@bigswitch.com>
Date: Fri, 8 Feb 2013 17:30:23 +0000 (-0800)
Subject: openvswitch: Fix ovs_vport_cmd_del return value on success
X-Git-Tag: next-20130320~118^2~18^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=734907e82d21a75a514b80164185427a832a00c0;p=karo-tx-linux.git

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

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index f996db343247..5e275b903f3c 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,