From: Jesse Gross <jesse@nicira.com>
Date: Mon, 13 May 2013 15:41:06 +0000 (-0700)
Subject: openvswitch: Fix bad merge resolution.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=30444e981ba28e892c439017fbc011d867f02a7d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index f7e3a0d84c40..f2ed7600084e 100644
--- 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: