| Message ID | 2d76ae315befc6be09e25e17a5640c53189e293c.1600690408.git.geliangtang@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | d1253b022a7b421d4e2399acd208f529c31228de |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [mptcp-next] Squash-to: "mptcp: retransmit ADD_ADDR when timeout v5" | expand |
On Mon, 2020-09-21 at 20:16 +0800, Geliang Tang wrote: > Improving patch "mptcp: retransmit ADD_ADDR when timeout" v5 as Paolo > suggested. No commit message needs to update. > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > --- > net/mptcp/pm_netlink.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c > index 6fad2cc4cf5d..5a0e4d11bcc3 100644 > --- a/net/mptcp/pm_netlink.c > +++ b/net/mptcp/pm_netlink.c > @@ -191,16 +191,14 @@ static struct mptcp_pm_add_entry * > lookup_anno_list_by_saddr(struct mptcp_sock *msk, > struct mptcp_addr_info *addr) > { > - struct mptcp_pm_add_entry *entry, *ret = NULL; > + struct mptcp_pm_add_entry *entry; > > list_for_each_entry(entry, &msk->pm.anno_list, list) { > - if (addresses_equal(&entry->addr, addr, false)) { > - ret = entry; > - break; > - } > + if (addresses_equal(&entry->addr, addr, false)) > + return entry; > } > > - return ret; > + return NULL; > } > > static void mptcp_pm_add_timer(struct timer_list *timer) > @@ -214,7 +212,7 @@ static void mptcp_pm_add_timer(struct timer_list > *timer) > if (!msk) > return; > > - if (sk->sk_state == TCP_CLOSE) > + if (inet_sk_state_load(sk) == TCP_CLOSE) > return; > > if (!entry->addr.id) > @@ -251,6 +249,8 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, > > spin_lock_bh(&msk->pm.lock); > entry = lookup_anno_list_by_saddr(msk, addr); > + if (entry) > + entry->retrans_times = ADD_ADDR_RETRANS_MAX; > spin_unlock_bh(&msk->pm.lock); > > if (entry) LGTM, thanks! I think can be merged (togethar with mptcp: retransmit ADD_ADDR when timeout and others v5) Cheers, Paolo
Hi Geliang, Paolo, On 21/09/2020 19:05, Paolo Abeni wrote: > On Mon, 2020-09-21 at 20:16 +0800, Geliang Tang wrote: >> Improving patch "mptcp: retransmit ADD_ADDR when timeout" v5 as Paolo >> suggested. No commit message needs to update. >> >> Signed-off-by: Geliang Tang <geliangtang@gmail.com> > > > LGTM, thanks! > > I think can be merged (togethar with mptcp: retransmit ADD_ADDR when > timeout and others v5) Thank you for the patch and the review! - d1253b022a7b: "squashed" in "mptcp: retransmit ADD_ADDR when timeout" - 8c5acf4c1ab3..15b3d6c015b4: result Test + export are going to be started soon! Cheers, Matt
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 6fad2cc4cf5d..5a0e4d11bcc3 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -191,16 +191,14 @@ static struct mptcp_pm_add_entry * lookup_anno_list_by_saddr(struct mptcp_sock *msk, struct mptcp_addr_info *addr) { - struct mptcp_pm_add_entry *entry, *ret = NULL; + struct mptcp_pm_add_entry *entry; list_for_each_entry(entry, &msk->pm.anno_list, list) { - if (addresses_equal(&entry->addr, addr, false)) { - ret = entry; - break; - } + if (addresses_equal(&entry->addr, addr, false)) + return entry; } - return ret; + return NULL; } static void mptcp_pm_add_timer(struct timer_list *timer) @@ -214,7 +212,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) if (!msk) return; - if (sk->sk_state == TCP_CLOSE) + if (inet_sk_state_load(sk) == TCP_CLOSE) return; if (!entry->addr.id) @@ -251,6 +249,8 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, spin_lock_bh(&msk->pm.lock); entry = lookup_anno_list_by_saddr(msk, addr); + if (entry) + entry->retrans_times = ADD_ADDR_RETRANS_MAX; spin_unlock_bh(&msk->pm.lock); if (entry)
Improving patch "mptcp: retransmit ADD_ADDR when timeout" v5 as Paolo suggested. No commit message needs to update. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- net/mptcp/pm_netlink.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)