diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-21 21:50:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-21 21:50:23 +0100 |
| commit | bf9790bcdca582a7a3a0c10550a52ba2a9efc5c9 (patch) | |
| tree | f6325c050ad109e95ba8ae932f9fd5f1483f1dae /net/tipc/node.c | |
| parent | 728c4a87f31d30669a103dac1851a15f4e2af03c (diff) | |
| parent | f13db334bf7b68b0086d04ab6a51517ba41123b4 (diff) | |
| download | talos-op-linux-bf9790bcdca582a7a3a0c10550a52ba2a9efc5c9.tar.gz talos-op-linux-bf9790bcdca582a7a3a0c10550a52ba2a9efc5c9.zip | |
Merge branch 'topic/const' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-blackfin
Diffstat (limited to 'net/tipc/node.c')
| -rw-r--r-- | net/tipc/node.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index aeef8011ac7d..9b4dcb6a16b5 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -1455,10 +1455,8 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb, /* Initiate synch mode if applicable */ if ((usr == TUNNEL_PROTOCOL) && (mtyp == SYNCH_MSG) && (oseqno == 1)) { syncpt = iseqno + exp_pkts - 1; - if (!tipc_link_is_up(l)) { - tipc_link_fsm_evt(l, LINK_ESTABLISH_EVT); + if (!tipc_link_is_up(l)) __tipc_node_link_up(n, bearer_id, xmitq); - } if (n->state == SELF_UP_PEER_UP) { n->sync_point = syncpt; tipc_link_fsm_evt(l, LINK_SYNCH_BEGIN_EVT); |
