]> git.karo-electronics.de Git - linux-beck.git/commitdiff
openvswitch: Fix ovs_vport_cmd_del return value on success
authorRich Lane <rlane@bigswitch.com>
Fri, 8 Feb 2013 17:30:23 +0000 (09:30 -0800)
committerJesse Gross <jesse@nicira.com>
Sat, 23 Feb 2013 01:01:49 +0000 (17:01 -0800)
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>
net/openvswitch/datapath.c

index f996db343247aab3b155a27df330252de35761db..5e275b903f3c9a6c75df77e256e97e9eef91c003 100644 (file)
@@ -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,