android/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Use renamed OSIF logging macros

Browse Source 
Change Id3273498f623d04beec879aa9d77c1d33986357a ("qcacmn: Rename OSIF
logging macros") is renaming the OSIF logging macros, so update the
legacy OSIF to use the new names.

Change-Id: I73d4214c9fecc435f9ac8c9f79560aa36333d311
CRs-Fixed: 2469498
This commit is contained in:
Jeff Johnson 2019-06-11 15:08:21 -07:00 committed by nshrivas
parent 69b908b88d
commit 93cc00cb90
4 changed files with 393 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
os_if/interop_issues_ap/src/wlan_cfg80211_interop_issues_ap.c
View File

@ -66,18 +66,18 @@ wlan_cfg80211_send_interop_issues_ap_cb(
uint32_t index, len;
if (!data) {
cfg80211_err("Invalid result.");
osif_err("Invalid result.");
return;
}
pdev = data->pdev;
if (!pdev) {
cfg80211_err("pdev is null.");
osif_err("pdev is null.");
return;
}
os_priv = wlan_pdev_get_ospriv(pdev);
if (!os_priv) {
cfg80211_err("os_priv is null.");
osif_err("os_priv is null.");
return;
}
@ -86,17 +86,17 @@ wlan_cfg80211_send_interop_issues_ap_cb(
skb = cfg80211_vendor_event_alloc(os_priv->wiphy, NULL, len, index,
GFP_KERNEL);
if (!skb) {
cfg80211_err("skb alloc failed");
osif_err("skb alloc failed");
return;
}
cfg80211_debug("interop issues ap mac:" QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(data->rap_addr.bytes));
osif_debug("interop issues ap mac:" QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(data->rap_addr.bytes));
if (nla_put(skb,
QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_BSSID,
QDF_MAC_ADDR_SIZE, data->rap_addr.bytes)) {
cfg80211_err("nla put fail");
osif_err("nla put fail");
kfree_skb(skb);
return;
}
@ -131,7 +131,7 @@ wlan_parse_interop_issues_ap(struct qdf_mac_addr *interop_issues_ap,
nla_for_each_nested(curr_attr, attr, rem) {
if (i == MAX_INTEROP_ISSUES_AP_NUM) {
cfg80211_err("Ignoring excess");
osif_err("Ignoring excess");
break;
}
@ -140,18 +140,18 @@ wlan_parse_interop_issues_ap(struct qdf_mac_addr *interop_issues_ap,
nla_data(curr_attr),
nla_len(curr_attr),
interop_issues_ap_policy)) {
cfg80211_err("nla_parse failed");
osif_err("nla_parse failed");
return -EINVAL;
}
if (!tb2[QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_BSSID]) {
cfg80211_err("attr addr failed");
osif_err("attr addr failed");
return -EINVAL;
}
nla_memcpy(interop_issues_ap[i].bytes,
tb2[QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_BSSID],
QDF_MAC_ADDR_SIZE);
cfg80211_debug(QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(interop_issues_ap[i].bytes));
osif_debug(QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(interop_issues_ap[i].bytes));
i++;
}
@ -183,7 +183,7 @@ __wlan_cfg80211_set_interop_issues_ap_config(struct wiphy *wiphy,
QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_MAX,
data, data_len,
interop_issues_ap_policy)) {
cfg80211_err("Invalid ATTR");
osif_err("Invalid ATTR");
return -EINVAL;
}
@ -196,7 +196,7 @@ __wlan_cfg80211_set_interop_issues_ap_config(struct wiphy *wiphy,
return -EINVAL;
}
cfg80211_debug("Num of interop issues ap: %d", count);
osif_debug("Num of interop issues ap: %d", count);
interop_issues_ap.count = count;
/*

446
os_if/nan/src/os_if_nan.c
View File

File diff suppressed because it is too large Load Diff

102
os_if/p2p/src/wlan_cfg80211_p2p.c
View File

@ -55,32 +55,32 @@ static void wlan_p2p_rx_callback(void *user_data,
struct wireless_dev *wdev;
uint16_t freq;
cfg80211_debug("user data:%pK, vdev id:%d, rssi:%d, buf:%pK, len:%d",
user_data, rx_frame->vdev_id, rx_frame->rx_rssi,
rx_frame->buf, rx_frame->frame_len);
osif_debug("user data:%pK, vdev id:%d, rssi:%d, buf:%pK, len:%d",
user_data, rx_frame->vdev_id, rx_frame->rx_rssi,
rx_frame->buf, rx_frame->frame_len);
psoc = user_data;
if (!psoc) {
cfg80211_err("psoc is null");
osif_err("psoc is null");
return;
}
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc,
rx_frame->vdev_id, WLAN_P2P_ID);
if (!vdev) {
cfg80211_err("vdev is null");
osif_err("vdev is null");
return;
}
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv) {
cfg80211_err("osif_priv is null");
osif_err("osif_priv is null");
goto fail;
}
wdev = osif_priv->wdev;
if (!wdev) {
cfg80211_err("wdev is null");
osif_err("wdev is null");
goto fail;
}
@ -91,7 +91,7 @@ static void wlan_p2p_rx_callback(void *user_data,
freq = ieee80211_channel_to_frequency(
rx_frame->rx_chan, NL80211_BAND_5GHZ);
cfg80211_debug("Indicate frame over nl80211, vdev id:%d, idx:%d",
osif_debug("Indicate frame over nl80211, vdev id:%d, idx:%d",
rx_frame->vdev_id, wdev->netdev->ifindex);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
@ -129,32 +129,32 @@ static void wlan_p2p_action_tx_cnf_callback(void *user_data,
struct wireless_dev *wdev;
bool is_success;
cfg80211_debug("user data:%pK, action cookie:%llx, buf:%pK, len:%d, tx status:%d",
user_data, tx_cnf->action_cookie, tx_cnf->buf,
tx_cnf->buf_len, tx_cnf->status);
osif_debug("user data:%pK, action cookie:%llx, buf:%pK, len:%d, tx status:%d",
user_data, tx_cnf->action_cookie, tx_cnf->buf,
tx_cnf->buf_len, tx_cnf->status);
psoc = user_data;
if (!psoc) {
cfg80211_err("psoc is null");
osif_err("psoc is null");
return;
}
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc,
tx_cnf->vdev_id, WLAN_P2P_ID);
if (!vdev) {
cfg80211_err("vdev is null");
osif_err("vdev is null");
return;
}
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv) {
cfg80211_err("osif_priv is null");
osif_err("osif_priv is null");
goto fail;
}
wdev = osif_priv->wdev;
if (!wdev) {
cfg80211_err("wireless dev is null");
osif_err("wireless dev is null");
goto fail;
}
@ -187,32 +187,32 @@ static void wlan_p2p_lo_event_callback(void *user_data,
struct wireless_dev *wdev;
struct sk_buff *vendor_event;
cfg80211_debug("user data:%pK, vdev id:%d, reason code:%d",
user_data, p2p_lo_event->vdev_id,
p2p_lo_event->reason_code);
osif_debug("user data:%pK, vdev id:%d, reason code:%d",
user_data, p2p_lo_event->vdev_id,
p2p_lo_event->reason_code);
psoc = user_data;
if (!psoc) {
cfg80211_err("psoc is null");
osif_err("psoc is null");
return;
}
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc,
p2p_lo_event->vdev_id, WLAN_P2P_ID);
if (!vdev) {
cfg80211_err("vdev is null");
osif_err("vdev is null");
return;
}
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv) {
cfg80211_err("osif_priv is null");
osif_err("osif_priv is null");
goto fail;
}
wdev = osif_priv->wdev;
if (!wdev) {
cfg80211_err("wireless dev is null");
osif_err("wireless dev is null");
goto fail;
}
@ -221,14 +221,14 @@ static void wlan_p2p_lo_event_callback(void *user_data,
QCA_NL80211_VENDOR_SUBCMD_P2P_LO_EVENT_INDEX,
GFP_KERNEL);
if (!vendor_event) {
cfg80211_err("cfg80211_vendor_event_alloc failed");
osif_err("cfg80211_vendor_event_alloc failed");
goto fail;
}
if (nla_put_u32(vendor_event,
QCA_WLAN_VENDOR_ATTR_P2P_LISTEN_OFFLOAD_STOP_REASON,
p2p_lo_event->reason_code)) {
cfg80211_err("nla put failed");
osif_err("nla put failed");
kfree_skb(vendor_event);
goto fail;
}
@ -269,38 +269,38 @@ static void wlan_p2p_event_callback(void *user_data,
struct vdev_osif_priv *osif_priv;
struct wireless_dev *wdev;
cfg80211_debug("user data:%pK, vdev id:%d, event type:%d",
user_data, p2p_event->vdev_id, p2p_event->roc_event);
osif_debug("user data:%pK, vdev id:%d, event type:%d",
user_data, p2p_event->vdev_id, p2p_event->roc_event);
psoc = user_data;
if (!psoc) {
cfg80211_err("psoc is null");
osif_err("psoc is null");
return;
}
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc,
p2p_event->vdev_id, WLAN_P2P_ID);
if (!vdev) {
cfg80211_err("vdev is null");
osif_err("vdev is null");
return;
}
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv) {
cfg80211_err("osif_priv is null");
osif_err("osif_priv is null");
goto fail;
}
wdev = osif_priv->wdev;
if (!wdev) {
cfg80211_err("wireless dev is null");
osif_err("wireless dev is null");
goto fail;
}
chan = ieee80211_get_channel(wdev->wiphy,
wlan_chan_to_freq(p2p_event->chan));
if (!chan) {
cfg80211_err("channel conversion failed");
osif_err("channel conversion failed");
goto fail;
}
@ -312,7 +312,7 @@ static void wlan_p2p_event_callback(void *user_data,
cfg80211_remain_on_channel_expired(wdev,
p2p_event->cookie, chan, GFP_KERNEL);
} else {
cfg80211_err("Invalid p2p event");
osif_err("Invalid p2p event");
}
fail:
@ -324,7 +324,7 @@ QDF_STATUS p2p_psoc_enable(struct wlan_objmgr_psoc *psoc)
struct p2p_start_param start_param;
if (!psoc) {
cfg80211_err("psoc null");
osif_err("psoc null");
return QDF_STATUS_E_INVAL;
}
@ -342,7 +342,7 @@ QDF_STATUS p2p_psoc_enable(struct wlan_objmgr_psoc *psoc)
QDF_STATUS p2p_psoc_disable(struct wlan_objmgr_psoc *psoc)
{
if (!psoc) {
cfg80211_err("psoc null");
osif_err("psoc null");
return QDF_STATUS_E_INVAL;
}
@ -360,19 +360,19 @@ int wlan_cfg80211_roc(struct wlan_objmgr_vdev *vdev,
int ret;
if (!vdev) {
cfg80211_err("invalid vdev object");
osif_err("invalid vdev object");
return -EINVAL;
}
if (!chan) {
cfg80211_err("invalid channel");
osif_err("invalid channel");
return -EINVAL;
}
psoc = wlan_vdev_get_psoc(vdev);
vdev_id = wlan_vdev_get_id(vdev);
if (!psoc) {
cfg80211_err("psoc handle is NULL");
osif_err("psoc handle is NULL");
return -EINVAL;
}
@ -382,13 +382,13 @@ int wlan_cfg80211_roc(struct wlan_objmgr_vdev *vdev,
ret = policy_mgr_is_chan_ok_for_dnbs(psoc, roc_req.chan, &ok);
if (QDF_IS_STATUS_ERROR(ret)) {
cfg80211_err("policy_mgr_is_chan_ok_for_dnbs():ret:%d",
ret);
osif_err("policy_mgr_is_chan_ok_for_dnbs():ret:%d",
ret);
return -EINVAL;
}
if (!ok) {
cfg80211_err("channel%d not OK for DNBS", roc_req.chan);
osif_err("channel%d not OK for DNBS", roc_req.chan);
return -EINVAL;
}
@ -402,13 +402,13 @@ int wlan_cfg80211_cancel_roc(struct wlan_objmgr_vdev *vdev,
struct wlan_objmgr_psoc *psoc;
if (!vdev) {
cfg80211_err("invalid vdev object");
osif_err("invalid vdev object");
return -EINVAL;
}
psoc = wlan_vdev_get_psoc(vdev);
if (!psoc) {
cfg80211_err("psoc handle is NULL");
osif_err("psoc handle is NULL");
return -EINVAL;
}
@ -428,19 +428,19 @@ int wlan_cfg80211_mgmt_tx(struct wlan_objmgr_vdev *vdev,
uint32_t channel = 0;
if (!vdev) {
cfg80211_err("invalid vdev object");
osif_err("invalid vdev object");
return -EINVAL;
}
if (chan)
channel = (uint32_t)wlan_freq_to_chan(chan->center_freq);
else
cfg80211_debug("NULL chan, set channel to 0");
osif_debug("NULL chan, set channel to 0");
psoc = wlan_vdev_get_psoc(vdev);
vdev_id = wlan_vdev_get_id(vdev);
if (!psoc) {
cfg80211_err("psoc handle is NULL");
osif_err("psoc handle is NULL");
return -EINVAL;
}
@ -454,13 +454,13 @@ int wlan_cfg80211_mgmt_tx(struct wlan_objmgr_vdev *vdev,
ret = policy_mgr_is_chan_ok_for_dnbs(psoc, channel, &ok);
if (QDF_IS_STATUS_ERROR(ret)) {
cfg80211_err("policy_mgr_is_chan_ok_for_dnbs():ret:%d",
ret);
osif_err("policy_mgr_is_chan_ok_for_dnbs():ret:%d",
ret);
return -EINVAL;
}
if (!ok) {
cfg80211_err("Rejecting mgmt_tx for channel:%d as DNSC is set",
channel);
osif_err("Rejecting mgmt_tx for channel:%d as DNSC is set",
channel);
return -EINVAL;
}
}
@ -484,13 +484,13 @@ int wlan_cfg80211_mgmt_tx_cancel(struct wlan_objmgr_vdev *vdev,
struct wlan_objmgr_psoc *psoc;
if (!vdev) {
cfg80211_err("invalid vdev object");
osif_err("invalid vdev object");
return -EINVAL;
}
psoc = wlan_vdev_get_psoc(vdev);
if (!psoc) {
cfg80211_err("psoc handle is NULL");
osif_err("psoc handle is NULL");
return -EINVAL;
}

209
os_if/tdls/src/wlan_cfg80211_tdls.c
View File

@ -47,8 +47,9 @@ static int wlan_cfg80211_tdls_validate_mac_addr(const uint8_t *mac)
static const uint8_t temp_mac[QDF_MAC_ADDR_SIZE] = {0};
if (!qdf_mem_cmp(mac, temp_mac, QDF_MAC_ADDR_SIZE)) {
cfg80211_debug("Invalid Mac address " QDF_MAC_ADDR_STR " cmd declined.",
QDF_MAC_ADDR_ARRAY(mac));
osif_debug("Invalid Mac address " QDF_MAC_ADDR_STR
" cmd declined.",
QDF_MAC_ADDR_ARRAY(mac));
return -EINVAL;
}
@ -62,14 +63,14 @@ QDF_STATUS wlan_cfg80211_tdls_osif_priv_init(struct wlan_objmgr_vdev *vdev)
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv) {
cfg80211_err("osif_priv is NULL!");
osif_err("osif_priv is NULL!");
return QDF_STATUS_E_FAULT;
}
cfg80211_debug("initialize tdls os if layer private structure");
osif_debug("initialize tdls os if layer private structure");
tdls_priv = qdf_mem_malloc(sizeof(*tdls_priv));
if (!tdls_priv) {
cfg80211_err("failed to allocate memory for tdls_priv");
osif_err("failed to allocate memory for tdls_priv");
return QDF_STATUS_E_NOMEM;
}
init_completion(&tdls_priv->tdls_add_peer_comp);
@ -91,11 +92,11 @@ void wlan_cfg80211_tdls_osif_priv_deinit(struct wlan_objmgr_vdev *vdev)
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv) {
cfg80211_err("osif_priv is NULL!");
osif_err("osif_priv is NULL!");
return;
}
cfg80211_debug("deinitialize tdls os if layer private structure");
osif_debug("deinitialize tdls os if layer private structure");
if (osif_priv->osif_tdls)
qdf_mem_free(osif_priv->osif_tdls);
osif_priv->osif_tdls = NULL;
@ -111,13 +112,13 @@ void hdd_notify_teardown_tdls_links(struct wlan_objmgr_psoc *psoc)
vdev = ucfg_get_tdls_vdev(psoc, WLAN_OSIF_ID);
if (!vdev) {
cfg80211_err("Unable to get the vdev");
osif_err("Unable to get the vdev");
return;
}
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv || !osif_priv->osif_tdls) {
cfg80211_err("osif priv or tdls priv is NULL");
osif_err("osif priv or tdls priv is NULL");
goto release_ref;
}
tdls_priv = osif_priv->osif_tdls;
@ -125,23 +126,23 @@ void hdd_notify_teardown_tdls_links(struct wlan_objmgr_psoc *psoc)
reinit_completion(&tdls_priv->tdls_teardown_comp);
status = ucfg_tdls_teardown_links(psoc);
if (QDF_IS_STATUS_ERROR(status)) {
cfg80211_err("ucfg_tdls_teardown_links failed err %d", status);
osif_err("ucfg_tdls_teardown_links failed err %d", status);
goto release_ref;
}
cfg80211_debug("Wait for tdls teardown completion. Timeout %u ms",
WAIT_TIME_FOR_TDLS_TEARDOWN_LINKS);
osif_debug("Wait for tdls teardown completion. Timeout %u ms",
WAIT_TIME_FOR_TDLS_TEARDOWN_LINKS);
rc = wait_for_completion_timeout(
&tdls_priv->tdls_teardown_comp,
msecs_to_jiffies(WAIT_TIME_FOR_TDLS_TEARDOWN_LINKS));
if (0 == rc) {
cfg80211_err(" Teardown Completion timed out rc: %ld", rc);
osif_err(" Teardown Completion timed out rc: %ld", rc);
goto release_ref;
}
cfg80211_debug("TDLS teardown completion status %ld ", rc);
osif_debug("TDLS teardown completion status %ld ", rc);
release_ref:
wlan_objmgr_vdev_release_ref(vdev,
@ -163,12 +164,12 @@ hdd_notify_sta_connect(uint8_t session_id,
QDF_STATUS status;
if (!vdev) {
cfg80211_err("vdev is NULL");
osif_err("vdev is NULL");
return;
}
status = wlan_objmgr_vdev_try_get_ref(vdev, WLAN_TDLS_NB_ID);
if (QDF_IS_STATUS_ERROR(status)) {
cfg80211_err("can't get vdev");
osif_err("can't get vdev");
return;
}
@ -188,13 +189,13 @@ void hdd_notify_sta_disconnect(uint8_t session_id,
QDF_STATUS status;
if (!vdev) {
cfg80211_err("vdev is NULL");
osif_err("vdev is NULL");
return;
}
status = wlan_objmgr_vdev_try_get_ref(vdev, WLAN_TDLS_NB_ID);
if (QDF_IS_STATUS_ERROR(status)) {
cfg80211_err("can't get vdev");
osif_err("can't get vdev");
return;
}
@ -221,18 +222,18 @@ int wlan_cfg80211_tdls_add_peer(struct wlan_objmgr_vdev *vdev,
if (status)
return status;
cfg80211_debug("Add TDLS peer " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac));
osif_debug("Add TDLS peer " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac));
add_peer_req = qdf_mem_malloc(sizeof(*add_peer_req));
if (!add_peer_req) {
cfg80211_err("Failed to allocate tdls add peer request mem");
osif_err("Failed to allocate tdls add peer request mem");
return -EINVAL;
}
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv || !osif_priv->osif_tdls) {
cfg80211_err("osif_tdls_vdev or osif_priv is NULL for the current vdev");
osif_err("osif_tdls_vdev or osif_priv is NULL for the current vdev");
status = -EINVAL;
goto error;
}
@ -244,7 +245,7 @@ int wlan_cfg80211_tdls_add_peer(struct wlan_objmgr_vdev *vdev,
reinit_completion(&tdls_priv->tdls_add_peer_comp);
status = ucfg_tdls_add_peer(vdev, add_peer_req);
if (QDF_IS_STATUS_ERROR(status)) {
cfg80211_err("ucfg_tdls_add_peer returned err %d", status);
osif_err("ucfg_tdls_add_peer returned err %d", status);
status = -EIO;
goto error;
}
@ -253,14 +254,14 @@ int wlan_cfg80211_tdls_add_peer(struct wlan_objmgr_vdev *vdev,
&tdls_priv->tdls_add_peer_comp,
msecs_to_jiffies(WAIT_TIME_TDLS_ADD_STA));
if (!rc) {
cfg80211_err("timeout for tdls add peer indication %ld", rc);
osif_err("timeout for tdls add peer indication %ld", rc);
status = -EPERM;
goto error;
}
if (QDF_IS_STATUS_ERROR(tdls_priv->tdls_add_peer_status)) {
cfg80211_err("tdls add peer failed, status:%d",
tdls_priv->tdls_add_peer_status);
osif_err("tdls add peer failed, status:%d",
tdls_priv->tdls_add_peer_status);
status = -EPERM;
}
error:
@ -311,11 +312,11 @@ tdls_calc_channels_from_staparams(struct tdls_update_peer_params *req_info,
wifi_chan_index = ((dest_chans[j] <= WLAN_CHANNEL_14) ? 1 : 4);
no_of_channels = src_chans[i + 1];
cfg80211_debug("i:%d,j:%d,k:%d,[%d]:%d,index:%d,chans_num: %d",
i, j, k, j,
dest_chans[j],
wifi_chan_index,
no_of_channels);
osif_debug("i:%d,j:%d,k:%d,[%d]:%d,index:%d,chans_num: %d",
i, j, k, j,
dest_chans[j],
wifi_chan_index,
no_of_channels);
for (k = 1; k <= no_of_channels &&
j < WLAN_MAC_MAX_SUPP_CHANNELS - 1; k++) {
@ -326,21 +327,21 @@ tdls_calc_channels_from_staparams(struct tdls_update_peer_params *req_info,
else
continue;
cfg80211_debug("i: %d, j: %d, k: %d, [%d]: %d",
i, j, k, j + 1, dest_chans[j + 1]);
osif_debug("i: %d, j: %d, k: %d, [%d]: %d",
i, j, k, j + 1, dest_chans[j + 1]);
j += 1;
}
}
num_unique_channels = j + 1;
cfg80211_debug("Unique Channel List: supported_channels ");
osif_debug("Unique Channel List: supported_channels ");
for (i = 0; i < num_unique_channels; i++)
cfg80211_debug("[%d]: %d,", i, dest_chans[i]);
osif_debug("[%d]: %d,", i, dest_chans[i]);
if (MAX_CHANNEL < num_unique_channels)
num_unique_channels = MAX_CHANNEL;
req_info->supported_channels_len = num_unique_channels;
cfg80211_debug("After removing duplcates supported_channels_len: %d",
req_info->supported_channels_len);
osif_debug("After removing duplcates supported_channels_len: %d",
req_info->supported_channels_len);
}
static void
@ -349,12 +350,12 @@ wlan_cfg80211_tdls_extract_params(struct tdls_update_peer_params *req_info,
{
int i;
cfg80211_debug("sta cap %d, uapsd_queue %d, max_sp %d",
params->capability,
params->uapsd_queues, params->max_sp);
osif_debug("sta cap %d, uapsd_queue %d, max_sp %d",
params->capability,
params->uapsd_queues, params->max_sp);
if (!req_info) {
cfg80211_err("reg_info is NULL");
osif_err("reg_info is NULL");
return;
}
req_info->capability = params->capability;
@ -365,9 +366,9 @@ wlan_cfg80211_tdls_extract_params(struct tdls_update_peer_params *req_info,
tdls_calc_channels_from_staparams(req_info, params);
if (params->supported_oper_classes_len > WLAN_MAX_SUPP_OPER_CLASSES) {
cfg80211_debug("received oper classes:%d, resetting it to max supported: %d",
params->supported_oper_classes_len,
WLAN_MAX_SUPP_OPER_CLASSES);
osif_debug("received oper classes:%d, resetting it to max supported: %d",
params->supported_oper_classes_len,
WLAN_MAX_SUPP_OPER_CLASSES);
params->supported_oper_classes_len = WLAN_MAX_SUPP_OPER_CLASSES;
}
@ -404,12 +405,12 @@ wlan_cfg80211_tdls_extract_params(struct tdls_update_peer_params *req_info,
qdf_mem_copy(req_info->supported_rates,
params->supported_rates,
req_info->supported_rates_len);
cfg80211_debug("Supported Rates with Length %d",
req_info->supported_rates_len);
osif_debug("Supported Rates with Length %d",
req_info->supported_rates_len);
for (i = 0; i < req_info->supported_rates_len; i++)
cfg80211_debug("[%d]: %0x", i,
req_info->supported_rates[i]);
osif_debug("[%d]: %0x", i,
req_info->supported_rates[i]);
}
if (params->vht_capa) {
@ -438,19 +439,19 @@ int wlan_cfg80211_tdls_update_peer(struct wlan_objmgr_vdev *vdev,
if (status)
return status;
cfg80211_debug("Update TDLS peer " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac));
osif_debug("Update TDLS peer " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(mac));
req_info = qdf_mem_malloc(sizeof(*req_info));
if (!req_info) {
cfg80211_err("Failed to allocate tdls add peer request mem");
osif_err("Failed to allocate tdls add peer request mem");
return -EINVAL;
}
wlan_cfg80211_tdls_extract_params(req_info, params);
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv || !osif_priv->osif_tdls) {
cfg80211_err("osif priv or tdls priv is NULL");
osif_err("osif priv or tdls priv is NULL");
status = -EINVAL;
goto error;
}
@ -461,7 +462,7 @@ int wlan_cfg80211_tdls_update_peer(struct wlan_objmgr_vdev *vdev,
reinit_completion(&tdls_priv->tdls_add_peer_comp);
status = ucfg_tdls_update_peer(vdev, req_info);
if (QDF_IS_STATUS_ERROR(status)) {
cfg80211_err("ucfg_tdls_update_peer returned err %d", status);
osif_err("ucfg_tdls_update_peer returned err %d", status);
status = -EIO;
goto error;
}
@ -470,14 +471,14 @@ int wlan_cfg80211_tdls_update_peer(struct wlan_objmgr_vdev *vdev,
&tdls_priv->tdls_add_peer_comp,
msecs_to_jiffies(WAIT_TIME_TDLS_ADD_STA));
if (!rc) {
cfg80211_err("timeout for tdls update peer indication %ld", rc);
osif_err("timeout for tdls update peer indication %ld", rc);
status = -EPERM;
goto error;
}
if (QDF_IS_STATUS_ERROR(tdls_priv->tdls_add_peer_status)) {
cfg80211_err("tdls update peer failed, status:%d",
tdls_priv->tdls_add_peer_status);
osif_err("tdls update peer failed, status:%d",
tdls_priv->tdls_add_peer_status);
status = -EPERM;
}
error:
@ -536,11 +537,11 @@ int wlan_cfg80211_tdls_configure_mode(struct wlan_objmgr_vdev *vdev,
tdls_mode = TDLS_SUPPORT_IMP_MODE;
return 0;
default:
cfg80211_err("Invalid TDLS trigger mode");
osif_err("Invalid TDLS trigger mode");
return -EINVAL;
}
cfg80211_notice("cfg80211 tdls trigger mode %d", trigger_mode);
osif_notice("cfg80211 tdls trigger mode %d", trigger_mode);
set_mode_params.source = TDLS_SET_MODE_SOURCE_USER;
set_mode_params.tdls_mode = tdls_mode;
set_mode_params.update_last = false;
@ -566,12 +567,12 @@ int wlan_cfg80211_tdls_oper(struct wlan_objmgr_vdev *vdev,
return status;
if (NL80211_TDLS_DISCOVERY_REQ == oper) {
cfg80211_warn(
osif_warn(
"We don't support in-driver setup/teardown/discovery");
return -ENOTSUPP;
}
cfg80211_debug("%s start", tdls_oper_to_str(oper));
osif_debug("%s start", tdls_oper_to_str(oper));
cmd = tdls_oper_to_cmd(oper);
switch (oper) {
case NL80211_TDLS_ENABLE_LINK:
@ -579,8 +580,8 @@ int wlan_cfg80211_tdls_oper(struct wlan_objmgr_vdev *vdev,
case NL80211_TDLS_SETUP:
status = ucfg_tdls_oper(vdev, peer, cmd);
if (QDF_IS_STATUS_ERROR(status)) {
cfg80211_err("%s fail %d",
tdls_oper_to_str(oper), status);
osif_err("%s fail %d",
tdls_oper_to_str(oper), status);
status = -EIO;
goto error;
}
@ -589,7 +590,7 @@ int wlan_cfg80211_tdls_oper(struct wlan_objmgr_vdev *vdev,
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv || !osif_priv->osif_tdls) {
cfg80211_err("osif priv or tdls priv is NULL");
osif_err("osif priv or tdls priv is NULL");
status = -EINVAL;
goto error;
}
@ -597,7 +598,7 @@ int wlan_cfg80211_tdls_oper(struct wlan_objmgr_vdev *vdev,
reinit_completion(&tdls_priv->tdls_del_peer_comp);
status = ucfg_tdls_oper(vdev, peer, cmd);
if (QDF_IS_STATUS_ERROR(status)) {
cfg80211_err("ucfg_tdls_disable_link fail %d", status);
osif_err("ucfg_tdls_disable_link fail %d", status);
status = -EIO;
goto error;
}
@ -606,12 +607,12 @@ int wlan_cfg80211_tdls_oper(struct wlan_objmgr_vdev *vdev,
&tdls_priv->tdls_del_peer_comp,
msecs_to_jiffies(WAIT_TIME_TDLS_DEL_STA));
if (!rc) {
cfg80211_err("timeout for tdls disable link %ld", rc);
osif_err("timeout for tdls disable link %ld", rc);
status = -EPERM;
}
break;
default:
cfg80211_err("unsupported event %d", oper);
osif_err("unsupported event %d", oper);
status = -ENOTSUPP;
}
@ -628,32 +629,32 @@ void wlan_cfg80211_tdls_rx_callback(void *user_data,
struct wireless_dev *wdev;
uint16_t freq;
cfg80211_debug("user data:%pK, vdev id:%d, rssi:%d, buf:%pK, len:%d",
user_data, rx_frame->vdev_id, rx_frame->rx_rssi,
rx_frame->buf, rx_frame->frame_len);
osif_debug("user data:%pK, vdev id:%d, rssi:%d, buf:%pK, len:%d",
user_data, rx_frame->vdev_id, rx_frame->rx_rssi,
rx_frame->buf, rx_frame->frame_len);
psoc = user_data;
if (!psoc) {
cfg80211_err("psoc is null");
osif_err("psoc is null");
return;
}
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc,
rx_frame->vdev_id, WLAN_TDLS_NB_ID);
if (!vdev) {
cfg80211_err("vdev is null");
osif_err("vdev is null");
return;
}
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv) {
cfg80211_err("osif_priv is null");
osif_err("osif_priv is null");
goto fail;
}
wdev = osif_priv->wdev;
if (!wdev) {
cfg80211_err("wdev is null");
osif_err("wdev is null");
goto fail;
}
@ -664,8 +665,8 @@ void wlan_cfg80211_tdls_rx_callback(void *user_data,
freq = ieee80211_channel_to_frequency(
rx_frame->rx_chan, NL80211_BAND_5GHZ);
cfg80211_notice("Indicate frame over nl80211, vdev id:%d, idx:%d",
rx_frame->vdev_id, wdev->netdev->ifindex);
osif_notice("Indicate frame over nl80211, vdev id:%d, idx:%d",
rx_frame->vdev_id, wdev->netdev->ifindex);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
cfg80211_rx_mgmt(wdev, freq, rx_frame->rx_rssi * 100,
@ -694,7 +695,7 @@ static void wlan_cfg80211_update_tdls_peers_rssi(struct wlan_objmgr_vdev *vdev)
vdev, bcast_mac.bytes,
&ret);
if (ret || !rssi_info) {
cfg80211_err("get peer rssi fail");
osif_err("get peer rssi fail");
wlan_cfg80211_mc_cp_stats_free_stats_event(rssi_info);
return;
}
@ -722,7 +723,7 @@ int wlan_cfg80211_tdls_get_all_peers(struct wlan_objmgr_vdev *vdev,
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv || !osif_priv->osif_tdls) {
cfg80211_err("osif_tdls_vdev or osif_priv is NULL for the current vdev");
osif_err("osif_tdls_vdev or osif_priv is NULL for the current vdev");
return -EINVAL;
}
@ -733,22 +734,22 @@ int wlan_cfg80211_tdls_get_all_peers(struct wlan_objmgr_vdev *vdev,
reinit_completion(&tdls_priv->tdls_user_cmd_comp);
status = ucfg_tdls_get_all_peers(vdev, buf, buflen);
if (QDF_IS_STATUS_ERROR(status)) {
cfg80211_err("ucfg_tdls_get_all_peers failed err %d", status);
osif_err("ucfg_tdls_get_all_peers failed err %d", status);
len = scnprintf(buf, buflen,
"\nucfg_tdls_send_mgmt failed\n");
goto error_get_tdls_peers;
}
cfg80211_debug("Wait for tdls_user_cmd_comp. Timeout %u ms",
WAIT_TIME_FOR_TDLS_USER_CMD);
osif_debug("Wait for tdls_user_cmd_comp. Timeout %u ms",
WAIT_TIME_FOR_TDLS_USER_CMD);
rc = wait_for_completion_timeout(
&tdls_priv->tdls_user_cmd_comp,
msecs_to_jiffies(WAIT_TIME_FOR_TDLS_USER_CMD));
if (0 == rc) {
cfg80211_err("TDLS user cmd get all peers timed out rc %ld",
rc);
osif_err("TDLS user cmd get all peers timed out rc %ld",
rc);
len = scnprintf(buf, buflen,
"\nTDLS user cmd get all peers timed out\n");
goto error_get_tdls_peers;
@ -781,7 +782,7 @@ int wlan_cfg80211_tdls_mgmt(struct wlan_objmgr_vdev *vdev,
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv || !osif_priv->osif_tdls) {
cfg80211_err("osif priv or tdls priv is NULL");
osif_err("osif priv or tdls priv is NULL");
return -EINVAL;
}
@ -789,8 +790,8 @@ int wlan_cfg80211_tdls_mgmt(struct wlan_objmgr_vdev *vdev,
/* make sure doesn't call send_mgmt() while it is pending */
if (TDLS_VDEV_MAGIC == tdls_priv->mgmt_tx_completion_status) {
cfg80211_err(QDF_MAC_ADDR_STR " action %d couldn't sent, as one is pending. return EBUSY",
QDF_MAC_ADDR_ARRAY(peer_mac), action_code);
osif_err(QDF_MAC_ADDR_STR " action %d couldn't sent, as one is pending. return EBUSY",
QDF_MAC_ADDR_ARRAY(peer_mac), action_code);
return -EBUSY;
}
@ -827,14 +828,14 @@ int wlan_cfg80211_tdls_mgmt(struct wlan_objmgr_vdev *vdev,
reinit_completion(&tdls_priv->tdls_mgmt_comp);
status = ucfg_tdls_send_mgmt_frame(&mgmt_req);
if (QDF_IS_STATUS_ERROR(status)) {
cfg80211_err("ucfg_tdls_send_mgmt failed err %d", status);
osif_err("ucfg_tdls_send_mgmt failed err %d", status);
status = -EIO;
tdls_priv->mgmt_tx_completion_status = false;
goto error_mgmt_req;
}
cfg80211_debug("Wait for tdls_mgmt_comp. Timeout %u ms",
WAIT_TIME_FOR_TDLS_MGMT);
osif_debug("Wait for tdls_mgmt_comp. Timeout %u ms",
WAIT_TIME_FOR_TDLS_MGMT);
rc = wait_for_completion_timeout(
&tdls_priv->tdls_mgmt_comp,
@ -842,18 +843,18 @@ int wlan_cfg80211_tdls_mgmt(struct wlan_objmgr_vdev *vdev,
if ((0 == rc) || (QDF_STATUS_SUCCESS !=
tdls_priv->mgmt_tx_completion_status)) {
cfg80211_err("%s rc %ld mgmtTxCompletionStatus %u",
!rc ? "Mgmt Tx Completion timed out" :
"Mgmt Tx Completion failed",
rc, tdls_priv->mgmt_tx_completion_status);
osif_err("%s rc %ld mgmtTxCompletionStatus %u",
!rc ? "Mgmt Tx Completion timed out" :
"Mgmt Tx Completion failed",
rc, tdls_priv->mgmt_tx_completion_status);
tdls_priv->mgmt_tx_completion_status = false;
status = -EINVAL;
goto error_mgmt_req;
}
cfg80211_debug("Mgmt Tx Completion status %ld TxCompletion %u",
rc, tdls_priv->mgmt_tx_completion_status);
osif_debug("Mgmt Tx Completion status %ld TxCompletion %u",
rc, tdls_priv->mgmt_tx_completion_status);
if (TDLS_SETUP_RESPONSE == action_code ||
TDLS_SETUP_CONFIRM == action_code) {
@ -879,13 +880,13 @@ int wlan_tdls_antenna_switch(struct wlan_objmgr_vdev *vdev, uint32_t mode)
unsigned long rc;
if (!vdev) {
cfg80211_err("vdev is NULL");
osif_err("vdev is NULL");
return -EAGAIN;
}
osif_priv = wlan_vdev_get_ospriv(vdev);
if (!osif_priv || !osif_priv->osif_tdls) {
cfg80211_err("osif priv or tdls priv is NULL");
osif_err("osif priv or tdls priv is NULL");
ret = -EINVAL;
goto error;
}
@ -894,7 +895,7 @@ int wlan_tdls_antenna_switch(struct wlan_objmgr_vdev *vdev, uint32_t mode)
reinit_completion(&tdls_priv->tdls_antenna_switch_comp);
ret = ucfg_tdls_antenna_switch(vdev, mode);
if (QDF_IS_STATUS_ERROR(ret)) {
cfg80211_err("ucfg_tdls_antenna_switch failed err %d", ret);
osif_err("ucfg_tdls_antenna_switch failed err %d", ret);
ret = -EAGAIN;
goto error;
}
@ -903,13 +904,13 @@ int wlan_tdls_antenna_switch(struct wlan_objmgr_vdev *vdev, uint32_t mode)
&tdls_priv->tdls_antenna_switch_comp,
msecs_to_jiffies(WAIT_TIME_FOR_TDLS_ANTENNA_SWITCH));
if (!rc) {
cfg80211_err("timeout for tdls antenna switch %ld", rc);
osif_err("timeout for tdls antenna switch %ld", rc);
ret = -EAGAIN;
goto error;
}
ret = tdls_priv->tdls_antenna_switch_status;
cfg80211_debug("tdls antenna switch status:%d", ret);
osif_debug("tdls antenna switch status:%d", ret);
error:
return ret;
}
@ -921,7 +922,7 @@ wlan_cfg80211_tdls_indicate_discovery(struct tdls_osif_indication *ind)
osif_vdev = wlan_vdev_get_ospriv(ind->vdev);
cfg80211_debug("Implicit TDLS, request Send Discovery request");
osif_debug("Implicit TDLS, request Send Discovery request");
cfg80211_tdls_oper_request(osif_vdev->wdev->netdev,
ind->peer_mac, NL80211_TDLS_DISCOVERY_REQ,
false, GFP_KERNEL);
@ -934,7 +935,7 @@ wlan_cfg80211_tdls_indicate_setup(struct tdls_osif_indication *ind)
osif_vdev = wlan_vdev_get_ospriv(ind->vdev);
cfg80211_debug("Indication to request TDLS setup");
osif_debug("Indication to request TDLS setup");
cfg80211_tdls_oper_request(osif_vdev->wdev->netdev,
ind->peer_mac, NL80211_TDLS_SETUP, false,
GFP_KERNEL);
@ -947,7 +948,7 @@ wlan_cfg80211_tdls_indicate_teardown(struct tdls_osif_indication *ind)
osif_vdev = wlan_vdev_get_ospriv(ind->vdev);
cfg80211_debug("Teardown reason %d", ind->reason);
osif_debug("Teardown reason %d", ind->reason);
cfg80211_tdls_oper_request(osif_vdev->wdev->netdev,
ind->peer_mac, NL80211_TDLS_TEARDOWN,
ind->reason, GFP_KERNEL);
@ -961,13 +962,13 @@ void wlan_cfg80211_tdls_event_callback(void *user_data,
struct osif_tdls_vdev *tdls_priv;
if (!ind || !ind->vdev) {
cfg80211_err("ind: %pK", ind);
osif_err("ind: %pK", ind);
return;
}
osif_vdev = wlan_vdev_get_ospriv(ind->vdev);
if (!osif_vdev || !osif_vdev->osif_tdls) {
cfg80211_err("osif priv or tdls priv is NULL");
osif_err("osif priv or tdls priv is NULL");
return;
}