diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-04 01:40:44 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-04 01:40:44 +0000 |
| commit | 38807196a3aec5022d00b5ef45560c7587cfc1ee (patch) | |
| tree | 2bb7613f30f9fe9fa501b7e3e96f249264c832a9 | |
| parent | e8e5d627d406e2967e38443a4d2ddcaddb1d5d76 (diff) | |
| parent | 4b9ddd948903a304f77e5684b2cf3dfbdf9f6e56 (diff) | |
| download | mt8516-v4.4-38807196a3aec5022d00b5ef45560c7587cfc1ee.tar.gz | |
Merge cherrypicks of [6928153] into oc-mr1-1.7-iot-release
Change-Id: I0f681c14f4768d38d2c7c2a77ad2b1c55a642594
| -rwxr-xr-x | drivers/misc/mediatek/connectivity/wlan/gen4-mt7668-usb/common/wlan_oid.c | 4 | ||||
| -rwxr-xr-x | drivers/misc/mediatek/connectivity/wlan/gen4-mt7668/common/wlan_oid.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668-usb/common/wlan_oid.c b/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668-usb/common/wlan_oid.c index 5bda1727da71..1e658384a91b 100755 --- a/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668-usb/common/wlan_oid.c +++ b/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668-usb/common/wlan_oid.c @@ -1149,8 +1149,8 @@ wlanoidSetConnect(IN P_ADAPTER_T prAdapter, IN PVOID pvSetBuffer, IN UINT_32 u4S if (kalGetMediaStateIndicated(prGlueInfo) == PARAM_MEDIA_STATE_CONNECTED) { if (fgEqualSsid) { prAisAbortMsg->ucReasonOfDisconnect = DISCONNECT_REASON_CODE_REASSOCIATION; - if (fgEqualBssid) - kalSetMediaStateIndicated(prGlueInfo, PARAM_MEDIA_STATE_TO_BE_INDICATED); + kalSetMediaStateIndicated(prGlueInfo, + PARAM_MEDIA_STATE_TO_BE_INDICATED); } else { DBGLOG(INIT, INFO, "DisBySsid\n"); kalIndicateStatusAndComplete(prGlueInfo, WLAN_STATUS_MEDIA_DISCONNECT, NULL, 0); diff --git a/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668/common/wlan_oid.c b/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668/common/wlan_oid.c index 5bda1727da71..1e658384a91b 100755 --- a/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668/common/wlan_oid.c +++ b/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668/common/wlan_oid.c @@ -1149,8 +1149,8 @@ wlanoidSetConnect(IN P_ADAPTER_T prAdapter, IN PVOID pvSetBuffer, IN UINT_32 u4S if (kalGetMediaStateIndicated(prGlueInfo) == PARAM_MEDIA_STATE_CONNECTED) { if (fgEqualSsid) { prAisAbortMsg->ucReasonOfDisconnect = DISCONNECT_REASON_CODE_REASSOCIATION; - if (fgEqualBssid) - kalSetMediaStateIndicated(prGlueInfo, PARAM_MEDIA_STATE_TO_BE_INDICATED); + kalSetMediaStateIndicated(prGlueInfo, + PARAM_MEDIA_STATE_TO_BE_INDICATED); } else { DBGLOG(INIT, INFO, "DisBySsid\n"); kalIndicateStatusAndComplete(prGlueInfo, WLAN_STATUS_MEDIA_DISCONNECT, NULL, 0); |