openvswitch: Fix bad merge resolution.

git silently included an extra hunk in vport_cmd_set() during automatic merging. This code is unreachable so it does not actually introduce a problem but it is clearly incorrect. Signed-off-by: Jesse Gross <[email protected]>
makiko-fly · Aug 14, 2013 · 30444e9 · 30444e9
1 parent ad81f05
commit 30444e9
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
@@ -2076,9 +2076,6 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
 	ovs_notify(reply, info, &ovs_dp_vport_multicast_group);
 	return 0;
 
-	rtnl_unlock();
-	return 0;
-
 exit_free:
 	kfree_skb(reply);
 exit_unlock: