samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
派生 0
代码 工单 合并请求 工作流 软件包 项目 发布 百科 活动

qcacld-3.0: components: Change %pM/QDF_MAC_ADDR_STR/ARRAY to QDF_MAC_ADDR_FMT/REF

浏览代码 
Change %pM/QDF_MAC_ADDR_STR/ARRAY to QDF_MAC_ADDR_FMT/REF.

CRs-Fixed: 2752355
Change-Id: I2d776be789df3e83e0c13211844b66d595498829
这个提交包含在：
Srinivas Girigowda
2020-08-10 17:07:00 -07:00
提交者 snandini
父节点 451c5f8601
当前提交 f375188704
共修改 17 个文件，包含 148 行新增和 130 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

62
components/p2p/core/src/wlan_p2p_off_chan_tx.c
查看文件

@@ -807,9 +807,9 @@ static QDF_STATUS p2p_tx_update_connection_status(
if (tx_frame_info->public_action_type !=
P2P_PUBLIC_ACTION_NOT_SUPPORT)
p2p_debug("%s ---> OTA to " QDF_MAC_ADDR_STR,
p2p_debug("%s ---> OTA to " QDF_MAC_ADDR_FMT,
p2p_get_frame_type_str(tx_frame_info),
QDF_MAC_ADDR_ARRAY(mac_to));
QDF_MAC_ADDR_REF(mac_to));
if ((tx_frame_info->public_action_type ==
P2P_PUBLIC_ACTION_PROV_DIS_REQ) &&
@@ -851,9 +851,9 @@ static QDF_STATUS p2p_rx_update_connection_status(
if (rx_frame_info->public_action_type !=
P2P_PUBLIC_ACTION_NOT_SUPPORT)
p2p_info("%s <--- OTA from " QDF_MAC_ADDR_STR,
p2p_info("%s <--- OTA from " QDF_MAC_ADDR_FMT,
p2p_get_frame_type_str(rx_frame_info),
QDF_MAC_ADDR_ARRAY(mac_from));
QDF_MAC_ADDR_REF(mac_from));
if ((rx_frame_info->public_action_type ==
P2P_PUBLIC_ACTION_PROV_DIS_REQ) &&
@@ -1560,8 +1560,8 @@ static QDF_STATUS p2p_populate_rmf_field(struct tx_action_context *tx_ctx,
if (!p2p_soc_obj->p2p_cb.is_mgmt_protected(
tx_ctx->vdev_id, wh->i_addr1)) {
p2p_debug("non rmf connection vdev %d "QDF_MAC_ADDR_STR,
tx_ctx->vdev_id, QDF_MAC_ADDR_ARRAY(wh->i_addr1));
p2p_debug("non rmf connection vdev %d "QDF_MAC_ADDR_FMT,
tx_ctx->vdev_id, QDF_MAC_ADDR_REF(wh->i_addr1));
return QDF_STATUS_SUCCESS;
}
if (!qdf_is_macaddr_group((struct qdf_mac_addr *)wh->i_addr1) &&
@@ -1595,10 +1595,10 @@ static QDF_STATUS p2p_populate_rmf_field(struct tx_action_context *tx_ctx,
*size - sizeof(*wh));
rmf_wh = (struct wlan_frame_hdr *)frame;
(rmf_wh)->i_fc[1] |= IEEE80211_FC1_WEP;
p2p_debug("set protection 0x%x cat %d "QDF_MAC_ADDR_STR,
p2p_debug("set protection 0x%x cat %d "QDF_MAC_ADDR_FMT,
tx_ctx->frame_info.sub_type,
action_hdr->action_category,
QDF_MAC_ADDR_ARRAY(wh->i_addr1));
QDF_MAC_ADDR_REF(wh->i_addr1));
qdf_nbuf_free(*ppkt);
*ppbuf = frame;
@@ -2095,8 +2095,8 @@ p2p_add_random_mac(struct wlan_objmgr_psoc *soc, uint32_t vdev_id,
struct p2p_vdev_priv_obj *p2p_vdev_obj;
struct wlan_objmgr_vdev *vdev;
p2p_debug("random_mac:vdev %d mac_addr:%pM rnd_cookie=%llu freq = %u",
vdev_id, mac, rnd_cookie, freq);
p2p_debug("random_mac:vdev %d mac_addr:"QDF_MAC_ADDR_FMT" rnd_cookie=%llu freq = %u",
vdev_id, QDF_MAC_ADDR_REF(mac), rnd_cookie, freq);
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(soc, vdev_id, WLAN_P2P_ID);
if (!vdev) {
@@ -2138,8 +2138,8 @@ p2p_add_random_mac(struct wlan_objmgr_psoc *soc, uint32_t vdev_id,
rnd_cookie);
qdf_spin_unlock(&p2p_vdev_obj->random_mac_lock);
wlan_objmgr_vdev_release_ref(vdev, WLAN_P2P_ID);
p2p_debug("random_mac:append %d vdev %d freq %d %pM rnd_cookie %llu",
append_ret, vdev_id, freq, mac, rnd_cookie);
p2p_debug("random_mac:append %d vdev %d freq %d "QDF_MAC_ADDR_FMT" rnd_cookie %llu",
append_ret, vdev_id, freq, QDF_MAC_ADDR_REF(mac), rnd_cookie);
if (!append_ret) {
p2p_debug("random_mac:failed to append rnd_cookie");
return QDF_STATUS_E_NOMEM;
@@ -2174,8 +2174,8 @@ p2p_add_random_mac(struct wlan_objmgr_psoc *soc, uint32_t vdev_id,
p2p_vdev_obj->random_mac[i].freq = freq;
qdf_spin_unlock(&p2p_vdev_obj->random_mac_lock);
wlan_objmgr_vdev_release_ref(vdev, WLAN_P2P_ID);
p2p_debug("random_mac:add vdev %d freq %d %pM rnd_cookie %llu",
vdev_id, freq, mac, rnd_cookie);
p2p_debug("random_mac:add vdev %d freq %d "QDF_MAC_ADDR_FMT" rnd_cookie %llu",
vdev_id, freq, QDF_MAC_ADDR_REF(mac), rnd_cookie);
return QDF_STATUS_SUCCESS;
}
@@ -2231,8 +2231,8 @@ p2p_del_random_mac(struct wlan_objmgr_psoc *soc, uint32_t vdev_id,
qdf_mc_timer_start(&random_mac->clear_timer, duration);
qdf_spin_lock(&p2p_vdev_obj->random_mac_lock);
p2p_debug("random_mac:noref on vdev %d addr %pM",
vdev_id, random_mac->addr);
p2p_debug("random_mac:noref on vdev %d addr "QDF_MAC_ADDR_FMT,
vdev_id, QDF_MAC_ADDR_REF(random_mac->addr));
}
break;
}
@@ -2282,8 +2282,8 @@ void p2p_del_all_rand_mac_vdev(struct wlan_objmgr_vdev *vdev)
qdf_mc_timer_stop(&p2p_vdev_obj->random_mac[i].clear_timer);
p2p_clear_mac_filter(wlan_vdev_get_psoc(vdev),
wlan_vdev_get_id(vdev), addr, freq);
p2p_debug("random_mac:delall vdev %d freq %d addr %pM",
wlan_vdev_get_id(vdev), freq, addr);
p2p_debug("random_mac:delall vdev %d freq %d addr "QDF_MAC_ADDR_FMT,
wlan_vdev_get_id(vdev), freq, QDF_MAC_ADDR_REF(addr));
qdf_spin_lock(&p2p_vdev_obj->random_mac_lock);
}
@@ -2404,9 +2404,10 @@ QDF_STATUS p2p_process_set_rand_mac_rsp(struct p2p_mac_filter_rsp *resp)
return QDF_STATUS_E_INVAL;
}
p2p_debug("random_mac:get pending req on vdev %d set %d mac filter %pM freq %d",
p2p_debug("random_mac:get pending req on vdev %d set %d mac filter "QDF_MAC_ADDR_FMT" freq %d",
p2p_vdev_obj->pending_req.vdev_id,
p2p_vdev_obj->pending_req.set, p2p_vdev_obj->pending_req.mac,
p2p_vdev_obj->pending_req.set,
QDF_MAC_ADDR_REF(p2p_vdev_obj->pending_req.mac),
p2p_vdev_obj->pending_req.freq);
if (p2p_vdev_obj->pending_req.cb)
p2p_vdev_obj->pending_req.cb(
@@ -2433,9 +2434,9 @@ p2p_process_set_rand_mac(struct p2p_set_mac_filter_req *set_filter_req)
p2p_debug("random_mac:set_filter_req is null");
return QDF_STATUS_E_INVAL;
}
p2p_debug("random_mac:vdev %d set %d mac filter %pM freq %d",
p2p_debug("random_mac:vdev %d set %d mac filter "QDF_MAC_ADDR_FMT" freq %d",
set_filter_req->vdev_id, set_filter_req->set,
set_filter_req->mac, set_filter_req->freq);
QDF_MAC_ADDR_REF(set_filter_req->mac), set_filter_req->freq);
soc = set_filter_req->soc;
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(
@@ -2453,10 +2454,10 @@ p2p_process_set_rand_mac(struct p2p_set_mac_filter_req *set_filter_req)
goto get_p2p_obj_failed;
}
if (p2p_vdev_obj->pending_req.soc) {
p2p_debug("random_mac:Busy on vdev %d set %d mac filter %pM freq %d",
p2p_debug("random_mac:Busy on vdev %d set %d mac filter "QDF_MAC_ADDR_FMT" freq %d",
p2p_vdev_obj->pending_req.vdev_id,
p2p_vdev_obj->pending_req.set,
p2p_vdev_obj->pending_req.mac,
QDF_MAC_ADDR_REF(p2p_vdev_obj->pending_req.mac),
p2p_vdev_obj->pending_req.freq);
goto get_p2p_obj_failed;
}
@@ -2513,8 +2514,8 @@ p2p_set_mac_filter(struct wlan_objmgr_psoc *soc, uint32_t vdev_id,
struct scheduler_msg msg = {0};
QDF_STATUS status;
p2p_debug("random_mac:vdev %d freq %d set %d %pM",
vdev_id, freq, set, mac);
p2p_debug("random_mac:vdev %d freq %d set %d "QDF_MAC_ADDR_FMT,
vdev_id, freq, set, QDF_MAC_ADDR_REF(mac));
set_filter_req = qdf_mem_malloc(sizeof(*set_filter_req));
if (!set_filter_req)
@@ -2633,8 +2634,9 @@ p2p_set_rand_mac(struct wlan_objmgr_psoc *soc, uint32_t vdev_id,
} else {
priv = osif_request_priv(request);
ret = priv->result;
p2p_debug("random_mac:vdev %d freq %d result %d %pM rnd_cookie %llu",
vdev_id, freq, priv->result, mac, rnd_cookie);
p2p_debug("random_mac:vdev %d freq %d result %d "QDF_MAC_ADDR_FMT" rnd_cookie %llu",
vdev_id, freq, priv->result,
QDF_MAC_ADDR_REF(mac), rnd_cookie);
}
}
osif_request_put(request);
@@ -2751,8 +2753,8 @@ static void p2p_mac_clear_timeout(void *context)
qdf_spin_unlock(&p2p_vdev_obj->random_mac_lock);
vdev_id = wlan_vdev_get_id(p2p_vdev_obj->vdev);
p2p_debug("random_mac:clear timeout vdev %d %pM freq %d clr %d",
vdev_id, addr, freq, clear);
p2p_debug("random_mac:clear timeout vdev %d "QDF_MAC_ADDR_FMT" freq %d clr %d",
vdev_id, QDF_MAC_ADDR_REF(addr), freq, clear);
if (clear)
p2p_clear_mac_filter(wlan_vdev_get_psoc(p2p_vdev_obj->vdev),
vdev_id, addr, freq);

4
components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c
查看文件

@@ -586,8 +586,8 @@ QDF_STATUS ucfg_p2p_register_callbacks(struct wlan_objmgr_psoc *soc,
struct p2p_soc_priv_obj *p2p_soc_obj;
if (!soc || !cb_obj) {
p2p_err("psoc %pM cb_obj %pM context passed is NULL", soc,
cb_obj);
p2p_err("psoc: %pK or cb_obj: %pK context passed is NULL",
soc, cb_obj);
return QDF_STATUS_E_INVAL;
}