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 <jesse@nicira.com>

parent ad81f054

net/openvswitch/datapath.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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);		ovs_notify(reply, info, &ovs_dp_vport_multicast_group);
	return 0;		return 0;

	rtnl_unlock();
	return 0;

	exit_free:		exit_free:
	kfree_skb(reply);		kfree_skb(reply);
	exit_unlock:		exit_unlock: