From 20234f7980043328e0b2d29dcee916d8c1df1a79 Mon Sep 17 00:00:00 2001 From: libo Date: Wed, 6 Jul 2022 11:06:47 +0800 Subject: [PATCH] wifi: no need to trigger WiFi disconnection event repeatedly [1/1] PD#SWPL-87270 Problem: Trigger WiFi disconnection event repeatedly Solution: When the upper layer triggers the disconnection of WiFi, do not send WiFi disconnection to the upper layer. Verify: ohm Signed-off-by: libo Change-Id: I6f1a46036c34d725fc2efaab5744114918129a11 --- bcmdhd.101.10.361.x/include/epivers.h | 2 +- bcmdhd.101.10.361.x/wl_cfg80211.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bcmdhd.101.10.361.x/include/epivers.h b/bcmdhd.101.10.361.x/include/epivers.h index 231cfeb..2bd2901 100755 --- a/bcmdhd.101.10.361.x/include/epivers.h +++ b/bcmdhd.101.10.361.x/include/epivers.h @@ -45,7 +45,7 @@ #elif (defined (BCMDBG_ASSERT) && !defined (BCMDBG_ASSERT_DISABLED)) #define EPI_VERSION_STR "101.10.361 (wlan=r892223 ASSRT)" #else -#define EPI_VERSION_STR "101.10.361.17 (wlan=r892223-20220415-1)(20220426-1)" +#define EPI_VERSION_STR "101.10.361.17 (wlan=r892223-20220415-1)(20220705-1)" #endif /* BCMINTERNAL */ #endif /* _epivers_h_ */ diff --git a/bcmdhd.101.10.361.x/wl_cfg80211.c b/bcmdhd.101.10.361.x/wl_cfg80211.c index 2739b3e..d646053 100755 --- a/bcmdhd.101.10.361.x/wl_cfg80211.c +++ b/bcmdhd.101.10.361.x/wl_cfg80211.c @@ -12416,6 +12416,11 @@ wl_handle_link_down(struct bcm_cfg80211 *cfg, wl_assoc_status_t *as) } #endif + if (wl_get_drv_status(cfg, DISCONNECTING, ndev)) { + /* If DISCONNECTING bit is set, mark locally generated */ + loc_gen = 1; + } + CFG80211_DISCONNECTED(ndev, reason, ie_ptr, ie_len, loc_gen, GFP_KERNEL); WL_MSG(ndev->name, "Disconnect event sent to upper layer" -- 2.20.1