| Message ID | 0a4053db6ce391392514c394f83386ed75efa050.1599470677.git.pabeni@redhat.com |
|---|---|
| State | Accepted, archived |
| Commit | 1cca88bf8dd6bb9dd1e4fff561ffe28c78640878 |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | Squash-to: "mptcp: add ADD_ADDR related mibs" | expand |
Hi Paolo, On 07/09/2020 11:37, Paolo Abeni wrote: > mptcp_incoming_options() can be called with either BH enabled or > disabled, so we need to use the safer MIB accounting helper > version. > > This fixes isssue#86 Thank you for the fix. I had the same ready this morning but some meetings didn't allow me to send the patch :) - 1cca88bf8dd6: "squashed" in "mptcp: add ADD_ADDR related mibs" - f0fcae160636: "Signed-off-by" + "Co-developed-by" - 522700f41751..fa888ff43702: result Tests + export are in progress. Cheers, Matt
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 0d1ff621613c..171039cbe9c4 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -891,9 +891,9 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb, #endif if (!mp_opt.echo) { mptcp_pm_add_addr_received(msk, &addr); - __MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ADDADDR); + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ADDADDR); } else { - __MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ECHOADD); + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ECHOADD); } mp_opt.add_addr = 0; }
mptcp_incoming_options() can be called with either BH enabled or disabled, so we need to use the safer MIB accounting helper version. This fixes isssue#86 Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- net/mptcp/options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)