summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2013-05-13 19:41:06 +0400
committerJesse Gross <jesse@nicira.com>2013-08-15 02:48:02 +0400
commit30444e981ba28e892c439017fbc011d867f02a7d (patch)
tree3f26f5da57a38f9365b03696c7cb733f86b67554
parentad81f0545ef01ea651886dddac4bef6cec930092 (diff)
downloadlinux-30444e981ba28e892c439017fbc011d867f02a7d.tar.xz
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>
-rw-r--r--net/openvswitch/datapath.c3
1 files changed, 0 insertions, 3 deletions
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: