---

yaml --- r: 300195 b: refs/heads/master c: 4cb6e11 h: refs/heads/master i: 300193: 7d5c2c3 300191: 8bbc878 v: v3
git-mirror · May 4, 2012 · fd68079 · fd68079
1 parent e70bfe8
commit fd68079
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf32fecdc1851ad9ca960f56771b798d17c26cf1
+refs/heads/master: 4cb6e116bb97c8b87a1f4f95e99d0c8dda2a6e9b
diff --git a/trunk/net/openvswitch/datapath.c b/trunk/net/openvswitch/datapath.c
@@ -1641,10 +1641,9 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
 	reply = ovs_vport_cmd_build_info(vport, info->snd_pid, info->snd_seq,
 					 OVS_VPORT_CMD_NEW);
 	if (IS_ERR(reply)) {
-		err = PTR_ERR(reply);
 		netlink_set_err(init_net.genl_sock, 0,
-				ovs_dp_vport_multicast_group.id, err);
-		return 0;
+				ovs_dp_vport_multicast_group.id, PTR_ERR(reply));
+		goto exit_unlock;
 	}
 
 	genl_notify(reply, genl_info_net(info), info->snd_pid,