From patchwork Mon Mar 2 03:25:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 11414641 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2C10C17E0 for ; Mon, 2 Mar 2020 03:26:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B2AC246B6 for ; Mon, 2 Mar 2020 03:26:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RqwOLPE/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726925AbgCBD04 (ORCPT ); Sun, 1 Mar 2020 22:26:56 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:43611 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726901AbgCBD0z (ORCPT ); Sun, 1 Mar 2020 22:26:55 -0500 Received: by mail-pg1-f195.google.com with SMTP id u12so4686917pgb.10 for ; Sun, 01 Mar 2020 19:26:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2IJ6v+vBNAPNbMMvS1O0Ku5Q+LCCSOnxCLcdXHEwvh4=; b=RqwOLPE/Bcg/5dpKgcIGb0cBoPI1lDtuMOdwJkQBykhfwHqDhUqvi++NUZKQQfGN2n CUOdspMkhrJYrkI4672F7G/e0wEZ40nxUi17EbG4EQur6NgQyOmPM8csIp+SSAF5yMuy rJTkL88qe+XYlD5akQ28h4/xvz45WmaU+jwnqlBnElSUp7zLNOaYAgnVefgB9goN+ima eJTY6BtxLfyI0nxO+g2OAClpjYJ9clmQSa8rRE1XgWIC4qrW7SRDdBF5zIlJq66CtkOM YuOyj1YPcT+vejzqjOyM0/c1p59hAvsoDgsf67p9ySttKgq+myv1dOUPVSYrdB4VXTgQ Wfzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2IJ6v+vBNAPNbMMvS1O0Ku5Q+LCCSOnxCLcdXHEwvh4=; b=BglJ9s1WkT4pJ16NCrAaSVnPuMT1SQ3gIEyERKoG0rflIAfW5SBHf13jGM0GepZ33I t6AB0wf5l+R1Hr9ItLTK9ejXQ/KCgBqHIBh2F8I5MhHKeoHc/MVPqi3IbeR4OsnTWl12 xin1ft3UpBj9SnLcukB/q0nRKdJVqezUZkZAXUj7wGll/m2Ltx3rEEZJx5EAR+DWmt4C cHYasEUoAMaJl3hVdyYML9P2z4mVoOc5PHUB50aQlQ+lO2IFc7lI6TIUcftfOm6E+poy uuu0DFDwj8SdM0TnLUrY8whH/O9Kn2oVLd/Ydcac9nMSujaWtOrYe+CCZymy4i1SKDG/ yLBg== X-Gm-Message-State: ANhLgQ2jCdBv74ForadtSuymR8cl+7eCFXARy8drvUttq9IgO6PMwfdq a0xTBXCZ8/IS88hrEW/3dGkxJQ== X-Google-Smtp-Source: ADFU+vsXk1eNu6nmXqw059tsROHTcg802qKJUw3BfLPuhaRNKqHg8tl6eNtdCUaTd4boNQ0QmypMmA== X-Received: by 2002:a63:c850:: with SMTP id l16mr4109458pgi.290.1583119614697; Sun, 01 Mar 2020 19:26:54 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id b133sm18435739pga.43.2020.03.01.19.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2020 19:26:54 -0800 (PST) From: Bjorn Andersson To: "David S. Miller" , Jakub Kicinski , Manivannan Sadhasivam Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 2/2] net: qrtr: Fix FIXME related to qrtr_ns_init() Date: Sun, 1 Mar 2020 19:25:27 -0800 Message-Id: <20200302032527.552916-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200302032527.552916-1-bjorn.andersson@linaro.org> References: <20200302032527.552916-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The 2 second delay before calling qrtr_ns_init() meant that the remote processors would register as endpoints in qrtr and the say_hello() call would therefor broadcast the outgoing HELLO to them. With the HELLO handshake corrected this delay is no longer needed. Signed-off-by: Bjorn Andersson Reviewed-by: Manivannan Sadhasivam Tested-by: Manivannan Sadhasivam --- net/qrtr/ns.c | 2 +- net/qrtr/qrtr.c | 6 +----- net/qrtr/qrtr.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c index e3f11052b5f6..cfd4bd07a62b 100644 --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -693,7 +693,7 @@ static void qrtr_ns_data_ready(struct sock *sk) queue_work(qrtr_ns.workqueue, &qrtr_ns.work); } -void qrtr_ns_init(struct work_struct *work) +void qrtr_ns_init(void) { struct sockaddr_qrtr sq; int ret; diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index 423310896285..313d3194018a 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -1263,11 +1263,7 @@ static int __init qrtr_proto_init(void) return rc; } - /* FIXME: Currently, this 2s delay is required to catch the NEW_SERVER - * messages from routers. But the fix could be somewhere else. - */ - INIT_DELAYED_WORK(&qrtr_ns_work, qrtr_ns_init); - schedule_delayed_work(&qrtr_ns_work, msecs_to_jiffies(2000)); + qrtr_ns_init(); return rc; } diff --git a/net/qrtr/qrtr.h b/net/qrtr/qrtr.h index 53a237a28971..dc2b67f17927 100644 --- a/net/qrtr/qrtr.h +++ b/net/qrtr/qrtr.h @@ -29,7 +29,7 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *ep); int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len); -void qrtr_ns_init(struct work_struct *work); +void qrtr_ns_init(void); void qrtr_ns_remove(void);