Skip to content

Commit 8135311

Browse files
committed
tgupdate: merge t/DO-NOT-MERGE-mptcp-enabled-by-default into t/upstream base
2 parents a59e158 + 5385971 commit 8135311

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

net/mptcp/pm.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,9 @@ void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,
251251

252252
pr_debug("msk=%p\n", msk);
253253

254+
if (!READ_ONCE(pm->work_pending))
255+
return;
256+
254257
spin_lock_bh(&pm->lock);
255258

256259
if (mptcp_lookup_anno_list_by_saddr(msk, addr) && READ_ONCE(pm->work_pending))

0 commit comments

Comments
 (0)