mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
83 lines
2.5 KiB
Diff
83 lines
2.5 KiB
Diff
From 71046abfffe9d34ae90c82cf9c8e44355c2e114c Mon Sep 17 00:00:00 2001
|
|
From: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
Date: Sun, 1 Mar 2020 23:03:05 -0800
|
|
Subject: [PATCH] net: qrtr: Fix FIXME related to qrtr_ns_init()
|
|
|
|
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.
|
|
|
|
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
|
Tested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
|
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
net/qrtr/ns.c | 2 +-
|
|
net/qrtr/qrtr.c | 10 +---------
|
|
net/qrtr/qrtr.h | 2 +-
|
|
3 files changed, 3 insertions(+), 11 deletions(-)
|
|
|
|
--- a/net/qrtr/ns.c
|
|
+++ b/net/qrtr/ns.c
|
|
@@ -693,7 +693,7 @@ static void qrtr_ns_data_ready(struct so
|
|
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;
|
|
--- a/net/qrtr/qrtr.c
|
|
+++ b/net/qrtr/qrtr.c
|
|
@@ -8,7 +8,6 @@
|
|
#include <linux/qrtr.h>
|
|
#include <linux/termios.h> /* For TIOCINQ/OUTQ */
|
|
#include <linux/numa.h>
|
|
-#include <linux/workqueue.h>
|
|
|
|
#include <net/sock.h>
|
|
|
|
@@ -108,8 +107,6 @@ static DEFINE_MUTEX(qrtr_node_lock);
|
|
static DEFINE_IDR(qrtr_ports);
|
|
static DEFINE_MUTEX(qrtr_port_lock);
|
|
|
|
-static struct delayed_work qrtr_ns_work;
|
|
-
|
|
/**
|
|
* struct qrtr_node - endpoint node
|
|
* @ep_lock: lock for endpoint management and callbacks
|
|
@@ -1095,11 +1092,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;
|
|
}
|
|
@@ -1107,7 +1100,6 @@ postcore_initcall(qrtr_proto_init);
|
|
|
|
static void __exit qrtr_proto_fini(void)
|
|
{
|
|
- cancel_delayed_work_sync(&qrtr_ns_work);
|
|
qrtr_ns_remove();
|
|
sock_unregister(qrtr_family.family);
|
|
proto_unregister(&qrtr_proto);
|
|
--- a/net/qrtr/qrtr.h
|
|
+++ b/net/qrtr/qrtr.h
|
|
@@ -29,7 +29,7 @@ void qrtr_endpoint_unregister(struct qrt
|
|
|
|
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);
|
|
|