From patchwork Mon Sep 7 09:37:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Abeni X-Patchwork-Id: 1358695 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fNxoWD5m; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BlNVj716Fz9sR4 for ; Mon, 7 Sep 2020 19:37:49 +1000 (AEST) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 7865A13A85BAD; Mon, 7 Sep 2020 02:37:47 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=63.128.21.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=pabeni@redhat.com; receiver= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 84E4B13A85BAA for ; Mon, 7 Sep 2020 02:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599471464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i/2nmBVsEyL5o5tAf6LTVqG7mRGQ2cSvH1vA9kpTC4c=; b=fNxoWD5my0wMV0ERPDHdKRvXSlCuxhaf1c11g5BQIv5wIXPbvM31p12gjhiSdZXpHJ6ziB ARVtZ68mvZjchB1sZ3Tl47XqSIo6jrWbO9CHlCTUmHsIve0H9Zkpar4WERBOgS3jdOL8vL wmw5Tr8JieIdnzM2izMigpy6wAXDba4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-520-9ulaVkbNMai_ceJJdwnUKQ-1; Mon, 07 Sep 2020 05:37:42 -0400 X-MC-Unique: 9ulaVkbNMai_ceJJdwnUKQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C882C1074662 for ; Mon, 7 Sep 2020 09:37:40 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-245.ams2.redhat.com [10.36.114.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DB917E187 for ; Mon, 7 Sep 2020 09:37:39 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.01.org Date: Mon, 7 Sep 2020 11:37:36 +0200 Message-Id: <0a4053db6ce391392514c394f83386ed75efa050.1599470677.git.pabeni@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Message-ID-Hash: 3657KZQ5KIOEL42XJH4IBGEB4YUSS37P X-Message-ID-Hash: 3657KZQ5KIOEL42XJH4IBGEB4YUSS37P X-MailFrom: pabeni@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH] Squash-to: "mptcp: add ADD_ADDR related mibs" List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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 --- net/mptcp/options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; }