diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 03:21:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 03:21:15 -0400 |
commit | 58ee01007c9e00531c1280b2d99b49d29a5e9844 (patch) | |
tree | d1feb7102591a811b4458e2e209d476580ae3687 /net/tipc/link.c | |
parent | 4850f26abfcac9ed28a4db5817b46dc0bfbbbae0 (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) |
Merge 5.2-rc6 into usb-next
We need the USB fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/tipc/link.c')
-rw-r--r-- | net/tipc/link.c | 1 |
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 | ||