diff options
| author | Jesse Gross <jesse@nicira.com> | 2013-05-13 08:41:06 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2013-08-14 15:48:02 -0700 |
| commit | 30444e981ba28e892c439017fbc011d867f02a7d (patch) | |
| tree | 3f26f5da57a38f9365b03696c7cb733f86b67554 /net | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
| download | linux-stable-30444e981ba28e892c439017fbc011d867f02a7d.tar.gz linux-stable-30444e981ba28e892c439017fbc011d867f02a7d.tar.bz2 linux-stable-30444e981ba28e892c439017fbc011d867f02a7d.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/openvswitch/datapath.c | 3 |
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: |