From cfb92e4301a9279a7fdd4555bf3804bfabfa3c6a Mon Sep 17 00:00:00 2001 From: EunBong Song Date: Mon, 31 Jul 2017 01:25:54 -0700 Subject: [PATCH] wifi driver: Fix problem of multiple declaration of cm_ctx This patch fixes multiple declaration of fn_destroy. This can cause linking error when kasan is enabled. Change-Id: I3674f0e6726ff82b65ce20be46884e3f0463beea Signed-off-by: EunBong Song --- os/drivers/wireless/scsc/dev.h | 2 +- os/drivers/wireless/scsc/t20_ops.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/os/drivers/wireless/scsc/dev.h b/os/drivers/wireless/scsc/dev.h index a7fbafe..1751369 100644 --- a/os/drivers/wireless/scsc/dev.h +++ b/os/drivers/wireless/scsc/dev.h @@ -115,7 +115,7 @@ struct slsi_cm_ctx { /* Only one wlan service instance is assumed for now. */ -struct slsi_cm_ctx cm_ctx; +extern struct slsi_cm_ctx cm_ctx; static inline void slsi_sig_send_init(struct slsi_sig_send *sig_send) { diff --git a/os/drivers/wireless/scsc/t20_ops.c b/os/drivers/wireless/scsc/t20_ops.c index 511dc23..7bb06af 100644 --- a/os/drivers/wireless/scsc/t20_ops.c +++ b/os/drivers/wireless/scsc/t20_ops.c @@ -54,6 +54,8 @@ static uint keep_alive_period = SLSI_P2PGO_KEEP_ALIVE_PERIOD_SEC; } #endif +struct slsi_cm_ctx cm_ctx; + static struct slsi_80211_channel slsi_2ghz_channels[] = { CHAN2G(2412, 1), CHAN2G(2417, 2), -- 2.7.4