projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad81f05
)
openvswitch: Fix bad merge resolution.
author
Jesse Gross
<jesse@nicira.com>
Mon, 13 May 2013 15:41:06 +0000
(08:41 -0700)
committer
Jesse Gross
<jesse@nicira.com>
Wed, 14 Aug 2013 22:48:02 +0000
(15:48 -0700)
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>
net/openvswitch/datapath.c
patch
|
blob
|
history
diff --git
a/net/openvswitch/datapath.c
b/net/openvswitch/datapath.c
index
f7e3a0d
..
f2ed760
100644
(file)
--- 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: