sync bes2600/ to v7.0-danctnix1 baseline (rebasing reference)
This commit is contained in:
+6
-5
@@ -533,10 +533,10 @@ void bes2600_scan_work(struct work_struct *work)
|
||||
"[SCAN] Scan failed (%d).\n",
|
||||
hw_priv->scan.status);
|
||||
else if (hw_priv->scan.req)
|
||||
wiphy_info(priv->hw->wiphy,
|
||||
wiphy_dbg(priv->hw->wiphy,
|
||||
"[SCAN] Scan completed.\n");
|
||||
else
|
||||
wiphy_info(priv->hw->wiphy,
|
||||
wiphy_dbg(priv->hw->wiphy,
|
||||
"[SCAN] Scan canceled.\n");
|
||||
|
||||
#ifdef WIFI_BT_COEXIST_EPTA_ENABLE
|
||||
@@ -621,8 +621,9 @@ void bes2600_scan_work(struct work_struct *work)
|
||||
scan.scanType = WSM_SCAN_TYPE_BACKGROUND;
|
||||
scan.scanFlags = WSM_SCAN_FLAG_FORCE_BACKGROUND;
|
||||
}
|
||||
scan.ch = kzalloc((it - hw_priv->scan.curr) *
|
||||
sizeof(struct wsm_scan_ch), GFP_KERNEL);
|
||||
scan.ch = kcalloc((it - hw_priv->scan.curr),
|
||||
sizeof(struct wsm_scan_ch),
|
||||
GFP_KERNEL);
|
||||
if (!scan.ch) {
|
||||
hw_priv->scan.status = -ENOMEM;
|
||||
goto fail;
|
||||
@@ -905,7 +906,7 @@ void bes2600_scan_complete_cb(struct bes2600_common *hw_priv,
|
||||
// recover EPTA timer after scan wsm msg complete, in case of epta state error
|
||||
// bwifi_change_current_status(hw_priv, BWIFI_STATUS_SCANNING_COMP);
|
||||
#endif
|
||||
wiphy_info(hw_priv->hw->wiphy, "bes2600_scan_complete_cb status: %u", arg->status);
|
||||
wiphy_dbg(hw_priv->hw->wiphy, "bes2600_scan_complete_cb status: %u", arg->status);
|
||||
|
||||
if(hw_priv->scan.status == -ETIMEDOUT)
|
||||
wiphy_warn(hw_priv->hw->wiphy,
|
||||
|
||||
Reference in New Issue
Block a user