summaryrefslogtreecommitdiffstats
path: root/net/tipc/link.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-06-24 13:19:53 -0400
committerIngo Molnar <mingo@kernel.org>2019-06-24 13:19:53 -0400
commitd2abae71ebcc409828b24ce9da402548ecdf1311 (patch)
tree5edfafc2828d3bcebb3698520ccba374cd4328c0 /net/tipc/link.c
parent66567fcbaecac455caa1b13643155d686b51ce63 (diff)
parent4b972a01a7da614b4796475f933094751a295a2f (diff)
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/tipc/link.c')
-rw-r--r--net/tipc/link.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index f5cd986e1e50..2050fd386642 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1728,7 +1728,6 @@ void tipc_link_failover_prepare(struct tipc_link *l, struct tipc_link *tnl,
1728 * node has entered SELF_DOWN_PEER_LEAVING and both peer nodes 1728 * node has entered SELF_DOWN_PEER_LEAVING and both peer nodes
1729 * would have to start over from scratch instead. 1729 * would have to start over from scratch instead.
1730 */ 1730 */
1731 WARN_ON(l && tipc_link_is_up(l));
1732 tnl->drop_point = 1; 1731 tnl->drop_point = 1;
1733 tnl->failover_reasm_skb = NULL; 1732 tnl->failover_reasm_skb = NULL;
1734 1733