summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-03-29 00:53:51 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-03-29 00:53:51 +0000
commitf988c2d02654c36efc3d2d4c40e79868c6484299 (patch)
tree0ea564ff0ddfa4d0a2eb54d8ec331f988204216d
parent8fb7702bd54919697ebc3662dd36c5305eb7f6be (diff)
parentf6a7a796224f5037e01fca6aa46ae317d140ee83 (diff)
downloadmt8516-v4.4-f988c2d02654c36efc3d2d4c40e79868c6484299.tar.gz
Merge cherrypicks of [6868916, 6869104, 6868530] into oc-mr1-1.7-iot-release
Change-Id: I19a7e3319b756c303d9a87963803ce0c66c30cb4
-rwxr-xr-xdrivers/misc/mediatek/connectivity/wlan/gen4-mt7668-usb/mgmt/rlm.c2
-rwxr-xr-xdrivers/misc/mediatek/connectivity/wlan/gen4-mt7668/mgmt/rlm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668-usb/mgmt/rlm.c b/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668-usb/mgmt/rlm.c
index 6469998694a7..c5122b72372e 100755
--- a/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668-usb/mgmt/rlm.c
+++ b/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668-usb/mgmt/rlm.c
@@ -3804,7 +3804,7 @@ VOID rlmProcessSpecMgtAction(P_ADAPTER_T prAdapter, P_SW_RFB_T prSwRfb)
DBGLOG(RLM, EVENT, "[Ch] TxAllowed = FALSE\n");
}
- if (prChannelSwitchAnnounceIE->ucChannelSwitchCount <= 3) {
+ {
DBGLOG(RLM, INFO,
"[Mgt Action] switch channel [%d]->[%d]\n",
prBssInfo->ucPrimaryChannel,
diff --git a/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668/mgmt/rlm.c b/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668/mgmt/rlm.c
index 6469998694a7..c5122b72372e 100755
--- a/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668/mgmt/rlm.c
+++ b/drivers/misc/mediatek/connectivity/wlan/gen4-mt7668/mgmt/rlm.c
@@ -3804,7 +3804,7 @@ VOID rlmProcessSpecMgtAction(P_ADAPTER_T prAdapter, P_SW_RFB_T prSwRfb)
DBGLOG(RLM, EVENT, "[Ch] TxAllowed = FALSE\n");
}
- if (prChannelSwitchAnnounceIE->ucChannelSwitchCount <= 3) {
+ {
DBGLOG(RLM, INFO,
"[Mgt Action] switch channel [%d]->[%d]\n",
prBssInfo->ucPrimaryChannel,