diff --git a/os_if/interop_issues_ap/src/wlan_cfg80211_interop_issues_ap.c b/os_if/interop_issues_ap/src/wlan_cfg80211_interop_issues_ap.c index dc65abe56aea..ebdd22d68d6d 100644 --- a/os_if/interop_issues_ap/src/wlan_cfg80211_interop_issues_ap.c +++ b/os_if/interop_issues_ap/src/wlan_cfg80211_interop_issues_ap.c @@ -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; /* diff --git a/os_if/nan/src/os_if_nan.c b/os_if/nan/src/os_if_nan.c index 648b4a4fd4dc..6ca042dd24d5 100644 --- a/os_if/nan/src/os_if_nan.c +++ b/os_if/nan/src/os_if_nan.c @@ -279,18 +279,18 @@ static int __os_if_nan_process_ndi_create(struct wlan_objmgr_psoc *psoc, struct wlan_objmgr_vdev *nan_vdev; struct nan_callbacks cb_obj; - cfg80211_debug("enter"); + osif_debug("enter"); nan_vdev = os_if_get_ndi_vdev_by_ifname(psoc, iface_name); if (nan_vdev) { - cfg80211_err("NAN data interface %s is already present", - iface_name); + osif_err("NAN data interface %s is already present", + iface_name); wlan_objmgr_vdev_release_ref(nan_vdev, WLAN_NAN_ID); return -EEXIST; } if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]) { - cfg80211_err("transaction id is unavailable"); + osif_err("transaction id is unavailable"); return -EINVAL; } transaction_id = @@ -298,13 +298,13 @@ static int __os_if_nan_process_ndi_create(struct wlan_objmgr_psoc *psoc, status = ucfg_nan_get_callbacks(psoc, &cb_obj); if (QDF_IS_STATUS_ERROR(status)) { - cfg80211_err("Couldn't get ballback object"); + osif_err("Couldn't get ballback object"); return -EINVAL; } ret = cb_obj.ndi_open(iface_name); if (ret) { - cfg80211_err("ndi_open failed"); + osif_err("ndi_open failed"); return ret; } @@ -426,8 +426,8 @@ static void os_if_nan_vdev_delete_peer(struct wlan_objmgr_psoc *psoc, { /* if peer belongs to nan vdev */ if (nan_vdev == wlan_peer_get_vdev(peer)) { - cfg80211_debug("deleting peer: %pM", - wlan_peer_get_macaddr(peer)); + osif_debug("deleting peer: %pM", + wlan_peer_get_macaddr(peer)); wlan_objmgr_peer_obj_delete(peer); } } @@ -444,13 +444,13 @@ static int __os_if_nan_process_ndi_delete(struct wlan_objmgr_psoc *psoc, struct wlan_objmgr_vdev *nan_vdev = NULL; if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]) { - cfg80211_err("Transaction id is unavailable"); + osif_err("Transaction id is unavailable"); return -EINVAL; } nan_vdev = os_if_get_ndi_vdev_by_ifname(psoc, iface_name); if (!nan_vdev) { - cfg80211_err("Nan datapath interface is not present"); + osif_err("Nan datapath interface is not present"); return -EINVAL; } @@ -472,12 +472,12 @@ static int __os_if_nan_process_ndi_delete(struct wlan_objmgr_psoc *psoc, /* check if there are active peers on the adapter */ if (num_peers) - cfg80211_err("NDP peers active: %d, active NDPs may not be terminated", - num_peers); + osif_err("NDP peers active: %d, active NDPs may not be terminated", + num_peers); status = ucfg_nan_get_callbacks(psoc, &cb_obj); if (QDF_IS_STATUS_ERROR(status)) { - cfg80211_err("Couldn't get ballback object"); + osif_err("Couldn't get ballback object"); return -EINVAL; } @@ -540,7 +540,7 @@ static int os_if_nan_parse_security_params(struct nlattr **tb, struct ndp_service_name *service_name) { if (!ncs_sk_type || !pmk || !passphrase || !service_name) { - cfg80211_err("out buffers for one ore more parameters is null"); + osif_err("out buffers for one ore more parameters is null"); return -EINVAL; } @@ -554,7 +554,7 @@ static int os_if_nan_parse_security_params(struct nlattr **tb, qdf_mem_copy(pmk->pmk, nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_PMK]), pmk->pmk_len); - cfg80211_err("pmk len: %d", pmk->pmk_len); + osif_err("pmk len: %d", pmk->pmk_len); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, pmk->pmk, pmk->pmk_len); } @@ -565,7 +565,7 @@ static int os_if_nan_parse_security_params(struct nlattr **tb, qdf_mem_copy(passphrase->passphrase, nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_PASSPHRASE]), passphrase->passphrase_len); - cfg80211_err("passphrase len: %d", passphrase->passphrase_len); + osif_err("passphrase len: %d", passphrase->passphrase_len); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, passphrase->passphrase, passphrase->passphrase_len); @@ -578,8 +578,8 @@ static int os_if_nan_parse_security_params(struct nlattr **tb, nla_data( tb[QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_NAME]), service_name->service_name_len); - cfg80211_err("service_name len: %d", - service_name->service_name_len); + osif_err("service_name len: %d", + service_name->service_name_len); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, service_name->service_name, service_name->service_name_len); @@ -621,12 +621,12 @@ static int __os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc, nan_vdev = os_if_get_ndi_vdev_by_ifname(psoc, iface_name); if (!nan_vdev) { - cfg80211_err("NAN data interface %s not available", iface_name); + osif_err("NAN data interface %s not available", iface_name); return -EINVAL; } if (nan_vdev->vdev_mlme.vdev_opmode != QDF_NDI_MODE) { - cfg80211_err("Interface found is not NDI"); + osif_err("Interface found is not NDI"); ret = -EINVAL; goto initiator_req_failed; } @@ -635,14 +635,14 @@ static int __os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc, if (state == NAN_DATA_NDI_DELETED_STATE || state == NAN_DATA_NDI_DELETING_STATE || state == NAN_DATA_NDI_CREATING_STATE) { - cfg80211_err("Data request not allowed in NDI current state: %d", - state); + osif_err("Data request not allowed in NDI current state: %d", + state); ret = -EINVAL; goto initiator_req_failed; } if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]) { - cfg80211_err("Transaction ID is unavailable"); + osif_err("Transaction ID is unavailable"); ret = -EINVAL; goto initiator_req_failed; } @@ -656,14 +656,14 @@ static int __os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc, req.channel_cfg = nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG]); } else { - cfg80211_err("Channel config is unavailable"); + osif_err("Channel config is unavailable"); ret = -EINVAL; goto initiator_req_failed; } } if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID]) { - cfg80211_err("NDP service instance ID is unavailable"); + osif_err("NDP service instance ID is unavailable"); ret = -EINVAL; goto initiator_req_failed; } @@ -674,7 +674,7 @@ static int __os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc, wlan_vdev_mlme_get_macaddr(nan_vdev), QDF_MAC_ADDR_SIZE); if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_PEER_DISCOVERY_MAC_ADDR]) { - cfg80211_err("NDI peer discovery mac addr is unavailable"); + osif_err("NDI peer discovery mac addr is unavailable"); ret = -EINVAL; goto initiator_req_failed; } @@ -704,22 +704,22 @@ static int __os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc, nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_IPV6_ADDR]), QDF_IPV6_ADDR_SIZE); } - cfg80211_debug("ipv6 addr present: %d, addr: %pI6", - req.is_ipv6_addr_present, req.ipv6_addr); + osif_debug("ipv6 addr present: %d, addr: %pI6", + req.is_ipv6_addr_present, req.ipv6_addr); if (os_if_nan_parse_security_params(tb, &req.ncs_sk_type, &req.pmk, &req.passphrase, &req.service_name)) { - cfg80211_err("inconsistent security params in request."); + osif_err("inconsistent security params in request."); ret = -EINVAL; goto initiator_req_failed; } - cfg80211_debug("vdev_id: %d, transaction_id: %d, channel: %d, service_instance_id: %d, ndp_app_info_len: %d, csid: %d, peer_discovery_mac_addr: %pM", - wlan_vdev_get_id(nan_vdev), req.transaction_id, - req.channel, req.service_instance_id, - req.ndp_info.ndp_app_info_len, req.ncs_sk_type, - req.peer_discovery_mac_addr.bytes); + osif_debug("vdev_id: %d, transaction_id: %d, channel: %d, service_instance_id: %d, ndp_app_info_len: %d, csid: %d, peer_discovery_mac_addr: %pM", + wlan_vdev_get_id(nan_vdev), req.transaction_id, + req.channel, req.service_instance_id, + req.ndp_info.ndp_app_info_len, req.ncs_sk_type, + req.peer_discovery_mac_addr.bytes); req.vdev = nan_vdev; status = ucfg_nan_req_processor(nan_vdev, &req, NDP_INITIATOR_REQ); @@ -788,7 +788,7 @@ static int __os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc, struct nan_datapath_responder_req req = {0}; if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_RESPONSE_CODE]) { - cfg80211_err("ndp_rsp is unavailable"); + osif_err("ndp_rsp is unavailable"); return -EINVAL; } req.ndp_rsp = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_RESPONSE_CODE]); @@ -797,13 +797,13 @@ static int __os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc, /* Check for an existing NAN interface */ nan_vdev = os_if_get_ndi_vdev_by_ifname(psoc, iface_name); if (!nan_vdev) { - cfg80211_err("NAN data iface %s not available", - iface_name); + osif_err("NAN data iface %s not available", + iface_name); return -ENODEV; } if (nan_vdev->vdev_mlme.vdev_opmode != QDF_NDI_MODE) { - cfg80211_err("Interface found is not NDI"); + osif_err("Interface found is not NDI"); ret = -ENODEV; goto responder_req_failed; } @@ -813,12 +813,12 @@ static int __os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc, * may not send the iface name. Use the first NDI * in that case */ - cfg80211_debug("ndp rsp rejected, using first NDI"); + osif_debug("ndp rsp rejected, using first NDI"); nan_vdev = wlan_objmgr_get_vdev_by_opmode_from_psoc( psoc, QDF_NDI_MODE, WLAN_NAN_ID); if (!nan_vdev) { - cfg80211_err("NAN data iface is not available"); + osif_err("NAN data iface is not available"); return -ENODEV; } } @@ -827,14 +827,14 @@ static int __os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc, if (state == NAN_DATA_NDI_DELETED_STATE || state == NAN_DATA_NDI_DELETING_STATE || state == NAN_DATA_NDI_CREATING_STATE) { - cfg80211_err("Data request not allowed in current NDI state:%d", - state); + osif_err("Data request not allowed in current NDI state:%d", + state); ret = -EAGAIN; goto responder_req_failed; } if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]) { - cfg80211_err("Transaction ID is unavailable"); + osif_err("Transaction ID is unavailable"); ret = -EINVAL; goto responder_req_failed; } @@ -842,7 +842,7 @@ static int __os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc, nla_get_u16(tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]); if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_INSTANCE_ID]) { - cfg80211_err("Instance ID is unavailable"); + osif_err("Instance ID is unavailable"); ret = -EINVAL; goto responder_req_failed; } @@ -856,7 +856,7 @@ static int __os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc, nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_APP_INFO]), req.ndp_info.ndp_app_info_len); } else { - cfg80211_debug("NDP app info is unavailable"); + osif_debug("NDP app info is unavailable"); } if (tb[QCA_WLAN_VENDOR_ATTR_NDP_CONFIG_QOS]) { @@ -865,7 +865,7 @@ static int __os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc, *((uint32_t *)req.ndp_config.ndp_cfg) = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_CONFIG_QOS]); } else { - cfg80211_debug("NDP config data is unavailable"); + osif_debug("NDP config data is unavailable"); } if (tb[QCA_WLAN_VENDOR_ATTR_NDP_IPV6_ADDR]) { @@ -884,23 +884,23 @@ static int __os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc, req.protocol = nla_get_u8( tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSPORT_PROTOCOL]); } - cfg80211_debug("ipv6 addr present: %d, addr: %pI6", - req.is_ipv6_addr_present, req.ipv6_addr); - cfg80211_debug("port %d, present: %d", req.port, req.is_port_present); - cfg80211_debug("protocol %d, present: %d", - req.protocol, req.is_protocol_present); + osif_debug("ipv6 addr present: %d, addr: %pI6", + req.is_ipv6_addr_present, req.ipv6_addr); + osif_debug("port %d, present: %d", req.port, req.is_port_present); + osif_debug("protocol %d, present: %d", + req.protocol, req.is_protocol_present); if (os_if_nan_parse_security_params(tb, &req.ncs_sk_type, &req.pmk, &req.passphrase, &req.service_name)) { - cfg80211_err("inconsistent security params in request."); + osif_err("inconsistent security params in request."); ret = -EINVAL; goto responder_req_failed; } - cfg80211_debug("vdev_id: %d, transaction_id: %d, ndp_rsp %d, ndp_instance_id: %d, ndp_app_info_len: %d, csid: %d", - wlan_vdev_get_id(nan_vdev), req.transaction_id, req.ndp_rsp, - req.ndp_instance_id, req.ndp_info.ndp_app_info_len, - req.ncs_sk_type); + osif_debug("vdev_id: %d, transaction_id: %d, ndp_rsp %d, ndp_instance_id: %d, ndp_app_info_len: %d, csid: %d", + wlan_vdev_get_id(nan_vdev), req.transaction_id, req.ndp_rsp, + req.ndp_instance_id, req.ndp_info.ndp_app_info_len, + req.ncs_sk_type); req.vdev = nan_vdev; status = ucfg_nan_req_processor(nan_vdev, &req, NDP_RESPONDER_REQ); @@ -960,14 +960,14 @@ static int __os_if_nan_process_ndp_end_req(struct wlan_objmgr_psoc *psoc, struct nan_datapath_end_req req = {0}; if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]) { - cfg80211_err("Transaction ID is unavailable"); + osif_err("Transaction ID is unavailable"); return -EINVAL; } req.transaction_id = nla_get_u16(tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]); if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_INSTANCE_ID_ARRAY]) { - cfg80211_err("NDP instance ID array is unavailable"); + osif_err("NDP instance ID array is unavailable"); return -EINVAL; } @@ -975,20 +975,20 @@ static int __os_if_nan_process_ndp_end_req(struct wlan_objmgr_psoc *psoc, nla_len(tb[QCA_WLAN_VENDOR_ATTR_NDP_INSTANCE_ID_ARRAY]) / sizeof(uint32_t); if (0 >= req.num_ndp_instances) { - cfg80211_err("Num NDP instances is 0"); + osif_err("Num NDP instances is 0"); return -EINVAL; } qdf_mem_copy(req.ndp_ids, nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_INSTANCE_ID_ARRAY]), req.num_ndp_instances * sizeof(uint32_t)); - cfg80211_debug("sending ndp_end_req to SME, transaction_id: %d", - req.transaction_id); + osif_debug("sending ndp_end_req to SME, transaction_id: %d", + req.transaction_id); nan_vdev = wlan_objmgr_get_vdev_by_opmode_from_psoc(psoc, QDF_NDI_MODE, WLAN_NAN_ID); if (!nan_vdev) { - cfg80211_err("NAN data interface is not available"); + osif_err("NAN data interface is not available"); return -EINVAL; } @@ -1042,19 +1042,19 @@ int os_if_nan_process_ndp_cmd(struct wlan_objmgr_psoc *psoc, if (wlan_cfg80211_nla_parse(tb, QCA_WLAN_VENDOR_ATTR_NDP_PARAMS_MAX, data, data_len, vendor_attr_policy)) { - cfg80211_err("Invalid NDP vendor command attributes"); + osif_err("Invalid NDP vendor command attributes"); return -EINVAL; } /* Parse and fetch NDP Command Type*/ if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD]) { - cfg80211_err("NAN datapath cmd type failed"); + osif_err("NAN datapath cmd type failed"); return -EINVAL; } ndp_cmd_type = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD]); if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]) { - cfg80211_err("attr transaction id failed"); + osif_err("attr transaction id failed"); return -EINVAL; } transaction_id = nla_get_u16( @@ -1062,14 +1062,14 @@ int os_if_nan_process_ndp_cmd(struct wlan_objmgr_psoc *psoc, if (tb[QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR]) { iface_name = nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR]); - cfg80211_err("Transaction Id: %d NDPCmd: %d iface_name: %s", - transaction_id, ndp_cmd_type, iface_name); + osif_err("Transaction Id: %d NDPCmd: %d iface_name: %s", + transaction_id, ndp_cmd_type, iface_name); } else { - cfg80211_err("Transaction Id: %d NDPCmd: %d iface_name: unspecified", - transaction_id, ndp_cmd_type); + osif_err("Transaction Id: %d NDPCmd: %d iface_name: unspecified", + transaction_id, ndp_cmd_type); } - cfg80211_debug("Received NDP cmd: %d", ndp_cmd_type); + osif_debug("Received NDP cmd: %d", ndp_cmd_type); switch (ndp_cmd_type) { case QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_CREATE: return os_if_nan_process_ndi_create(psoc, tb); @@ -1082,7 +1082,7 @@ int os_if_nan_process_ndp_cmd(struct wlan_objmgr_psoc *psoc, case QCA_WLAN_VENDOR_ATTR_NDP_END_REQUEST: return os_if_nan_process_ndp_end_req(psoc, tb); default: - cfg80211_err("Unrecognized NDP vendor cmd %d", ndp_cmd_type); + osif_err("Unrecognized NDP vendor cmd %d", ndp_cmd_type); return -EINVAL; } @@ -1131,7 +1131,7 @@ static void os_if_ndp_initiator_rsp_handler(struct wlan_objmgr_vdev *vdev, struct pdev_osif_priv *os_priv = wlan_pdev_get_ospriv(pdev); if (!rsp) { - cfg80211_err("Invalid NDP Initator response"); + osif_err("Invalid NDP Initator response"); return; } @@ -1140,7 +1140,7 @@ static void os_if_ndp_initiator_rsp_handler(struct wlan_objmgr_vdev *vdev, data_len, QCA_NL80211_VENDOR_SUBCMD_NDP_INDEX, GFP_ATOMIC); if (!vendor_event) { - cfg80211_err("cfg80211_vendor_event_alloc failed"); + osif_err("cfg80211_vendor_event_alloc failed"); return; } @@ -1166,13 +1166,13 @@ static void os_if_ndp_initiator_rsp_handler(struct wlan_objmgr_vdev *vdev, rsp->reason)) goto ndp_initiator_rsp_nla_failed; - cfg80211_debug("NDP Initiator rsp sent, tid:%d, instance id:%d, status:%d, reason: %d", - rsp->transaction_id, rsp->ndp_instance_id, rsp->status, - rsp->reason); + osif_debug("NDP Initiator rsp sent, tid:%d, instance id:%d, status:%d, reason: %d", + rsp->transaction_id, rsp->ndp_instance_id, rsp->status, + rsp->reason); cfg80211_vendor_event(vendor_event, GFP_ATOMIC); return; ndp_initiator_rsp_nla_failed: - cfg80211_err("nla_put api failed"); + osif_err("nla_put api failed"); kfree_skb(vendor_event); } @@ -1215,19 +1215,19 @@ static void os_if_ndp_responder_rsp_handler(struct wlan_objmgr_vdev *vdev, struct pdev_osif_priv *os_priv = wlan_pdev_get_ospriv(pdev); if (!rsp) { - cfg80211_err("Invalid NDP Responder response"); + osif_err("Invalid NDP Responder response"); return; } - cfg80211_debug("NDP Responder,vdev id %d transaction_id %d status code: %d reason %d", - wlan_vdev_get_id(rsp->vdev), rsp->transaction_id, - rsp->status, rsp->reason); + osif_debug("NDP Responder,vdev id %d transaction_id %d status code: %d reason %d", + wlan_vdev_get_id(rsp->vdev), rsp->transaction_id, + rsp->status, rsp->reason); data_len = osif_ndp_get_ndp_responder_rsp_len(); vendor_event = cfg80211_vendor_event_alloc(os_priv->wiphy, NULL, data_len, QCA_NL80211_VENDOR_SUBCMD_NDP_INDEX, GFP_ATOMIC); if (!vendor_event) { - cfg80211_err("cfg80211_vendor_event_alloc failed"); + osif_err("cfg80211_vendor_event_alloc failed"); return; } @@ -1252,7 +1252,7 @@ static void os_if_ndp_responder_rsp_handler(struct wlan_objmgr_vdev *vdev, cfg80211_vendor_event(vendor_event, GFP_ATOMIC); return; ndp_responder_rsp_nla_failed: - cfg80211_err("nla_put api failed"); + osif_err("nla_put api failed"); kfree_skb(vendor_event); } @@ -1323,30 +1323,30 @@ static void os_if_ndp_indication_handler(struct wlan_objmgr_vdev *vdev, struct pdev_osif_priv *os_priv = wlan_pdev_get_ospriv(pdev); if (!event) { - cfg80211_err("Invalid NDP Indication"); + osif_err("Invalid NDP Indication"); return; } - cfg80211_debug("NDP Indication, policy: %d", event->policy); + osif_debug("NDP Indication, policy: %d", event->policy); state = ucfg_nan_get_ndi_state(vdev); /* check if we are in middle of deleting/creating the interface */ if (state == NAN_DATA_NDI_DELETED_STATE || state == NAN_DATA_NDI_DELETING_STATE || state == NAN_DATA_NDI_CREATING_STATE) { - cfg80211_err("Data request not allowed in current NDI state: %d", - state); + osif_err("Data request not allowed in current NDI state: %d", + state); return; } ifname = os_if_ndi_get_if_name(vdev); if (!ifname) { - cfg80211_err("ifname is null"); + osif_err("ifname is null"); return; } ifname_len = qdf_str_len(ifname); if (ifname_len > IFNAMSIZ) { - cfg80211_err("ifname(%zu) too long", ifname_len); + osif_err("ifname(%zu) too long", ifname_len); return; } @@ -1357,7 +1357,7 @@ static void os_if_ndp_indication_handler(struct wlan_objmgr_vdev *vdev, QCA_NL80211_VENDOR_SUBCMD_NDP_INDEX, GFP_ATOMIC); if (!vendor_event) { - cfg80211_err("cfg80211_vendor_event_alloc failed"); + osif_err("cfg80211_vendor_event_alloc failed"); return; } @@ -1414,8 +1414,8 @@ static void os_if_ndp_indication_handler(struct wlan_objmgr_vdev *vdev, event->scid.scid)) goto ndp_indication_nla_failed; - cfg80211_debug("csid: %d, scid_len: %d", - event->ncs_sk_type, event->scid.scid_len); + osif_debug("csid: %d, scid_len: %d", + event->ncs_sk_type, event->scid.scid_len); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG, event->scid.scid, event->scid.scid_len); @@ -1426,13 +1426,13 @@ static void os_if_ndp_indication_handler(struct wlan_objmgr_vdev *vdev, QDF_IPV6_ADDR_SIZE, event->ipv6_addr)) goto ndp_indication_nla_failed; } - cfg80211_debug("ipv6 addr present: %d, addr: %pI6", - event->is_ipv6_addr_present, event->ipv6_addr); + osif_debug("ipv6 addr present: %d, addr: %pI6", + event->is_ipv6_addr_present, event->ipv6_addr); cfg80211_vendor_event(vendor_event, GFP_ATOMIC); return; ndp_indication_nla_failed: - cfg80211_err("nla_put api failed"); + osif_err("nla_put api failed"); kfree_skb(vendor_event); } @@ -1490,7 +1490,7 @@ static QDF_STATUS os_if_ndp_confirm_pack_ch_info(struct sk_buff *event, int idx = 0; struct nlattr *ch_array, *ch_element; - cfg80211_debug("num_ch: %d", ndp_confirm->num_channels); + osif_debug("num_ch: %d", ndp_confirm->num_channels); if (!ndp_confirm->num_channels) return QDF_STATUS_SUCCESS; @@ -1499,10 +1499,10 @@ static QDF_STATUS os_if_ndp_confirm_pack_ch_info(struct sk_buff *event, return QDF_STATUS_E_FAULT; for (idx = 0; idx < ndp_confirm->num_channels; idx++) { - cfg80211_debug("Freq[%d]: freq: %d, width: %d, nss: %d", - idx, ndp_confirm->ch[idx].freq, - ndp_confirm->ch[idx].ch_width, - ndp_confirm->ch[idx].nss); + osif_debug("Freq[%d]: freq: %d, width: %d, nss: %d", + idx, ndp_confirm->ch[idx].freq, + ndp_confirm->ch[idx].ch_width, + ndp_confirm->ch[idx].nss); ch_element = nla_nest_start(event, idx); if (!ch_element) return QDF_STATUS_E_FAULT; @@ -1558,18 +1558,18 @@ os_if_ndp_confirm_ind_handler(struct wlan_objmgr_vdev *vdev, struct pdev_osif_priv *os_priv = wlan_pdev_get_ospriv(pdev); if (!ndp_confirm) { - cfg80211_err("Invalid NDP Initator response"); + osif_err("Invalid NDP Initator response"); return; } ifname = os_if_ndi_get_if_name(vdev); if (!ifname) { - cfg80211_err("ifname is null"); + osif_err("ifname is null"); return; } ifname_len = qdf_str_len(ifname); if (ifname_len > IFNAMSIZ) { - cfg80211_err("ifname(%zu) too long", ifname_len); + osif_err("ifname(%zu) too long", ifname_len); return; } @@ -1578,7 +1578,7 @@ os_if_ndp_confirm_ind_handler(struct wlan_objmgr_vdev *vdev, data_len, QCA_NL80211_VENDOR_SUBCMD_NDP_INDEX, GFP_ATOMIC); if (!vendor_event) { - cfg80211_err("cfg80211_vendor_event_alloc failed"); + osif_err("cfg80211_vendor_event_alloc failed"); return; } @@ -1638,27 +1638,27 @@ os_if_ndp_confirm_ind_handler(struct wlan_objmgr_vdev *vdev, QCA_WLAN_VENDOR_ATTR_NDP_TRANSPORT_PROTOCOL, ndp_confirm->protocol)) goto ndp_confirm_nla_failed; - cfg80211_debug("ipv6 addr present: %d, addr: %pI6", - ndp_confirm->is_ipv6_addr_present, - ndp_confirm->ipv6_addr); - cfg80211_debug("port %d, present: %d", - ndp_confirm->port, ndp_confirm->is_port_present); - cfg80211_debug("protocol %d, present: %d", - ndp_confirm->protocol, ndp_confirm->is_protocol_present); + osif_debug("ipv6 addr present: %d, addr: %pI6", + ndp_confirm->is_ipv6_addr_present, + ndp_confirm->ipv6_addr); + osif_debug("port %d, present: %d", + ndp_confirm->port, ndp_confirm->is_port_present); + osif_debug("protocol %d, present: %d", + ndp_confirm->protocol, ndp_confirm->is_protocol_present); cfg80211_vendor_event(vendor_event, GFP_ATOMIC); - cfg80211_debug("NDP confim sent, ndp instance id: %d, peer addr: %pM rsp_code: %d, reason_code: %d", - ndp_confirm->ndp_instance_id, - ndp_confirm->peer_ndi_mac_addr.bytes, - ndp_confirm->rsp_code, ndp_confirm->reason_code); + osif_debug("NDP confim sent, ndp instance id: %d, peer addr: %pM rsp_code: %d, reason_code: %d", + ndp_confirm->ndp_instance_id, + ndp_confirm->peer_ndi_mac_addr.bytes, + ndp_confirm->rsp_code, ndp_confirm->reason_code); - cfg80211_debug("NDP confim, ndp app info dump"); + osif_debug("NDP confim, ndp app info dump"); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG, ndp_confirm->ndp_info.ndp_app_info, ndp_confirm->ndp_info.ndp_app_info_len); return; ndp_confirm_nla_failed: - cfg80211_err("nla_put api failed"); + osif_err("nla_put api failed"); kfree_skb(vendor_event); } @@ -1701,7 +1701,7 @@ static void os_if_ndp_end_rsp_handler(struct wlan_objmgr_vdev *vdev, struct pdev_osif_priv *os_priv = wlan_pdev_get_ospriv(pdev); if (!rsp) { - cfg80211_err("Invalid ndp end response"); + osif_err("Invalid ndp end response"); return; } @@ -1710,7 +1710,7 @@ static void os_if_ndp_end_rsp_handler(struct wlan_objmgr_vdev *vdev, data_len, QCA_NL80211_VENDOR_SUBCMD_NDP_INDEX, GFP_ATOMIC); if (!vendor_event) { - cfg80211_err("cfg80211_vendor_event_alloc failed"); + osif_err("cfg80211_vendor_event_alloc failed"); return; } @@ -1731,13 +1731,13 @@ static void os_if_ndp_end_rsp_handler(struct wlan_objmgr_vdev *vdev, rsp->transaction_id)) goto ndp_end_rsp_nla_failed; - cfg80211_debug("NDP End rsp sent, transaction id: %d, status: %d, reason: %d", - rsp->transaction_id, rsp->status, rsp->reason); + osif_debug("NDP End rsp sent, transaction id: %d, status: %d, reason: %d", + rsp->transaction_id, rsp->status, rsp->reason); cfg80211_vendor_event(vendor_event, GFP_ATOMIC); return; ndp_end_rsp_nla_failed: - cfg80211_err("nla_put api failed"); + osif_err("nla_put api failed"); kfree_skb(vendor_event); } @@ -1777,14 +1777,14 @@ static void os_if_ndp_end_ind_handler(struct wlan_objmgr_vdev *vdev, struct pdev_osif_priv *os_priv = wlan_pdev_get_ospriv(pdev); if (!end_ind) { - cfg80211_err("Invalid ndp end indication"); + osif_err("Invalid ndp end indication"); return; } ndp_instance_array = qdf_mem_malloc(end_ind->num_ndp_ids * sizeof(*ndp_instance_array)); if (!ndp_instance_array) { - cfg80211_err("Failed to allocate ndp_instance_array"); + osif_err("Failed to allocate ndp_instance_array"); return; } for (i = 0; i < end_ind->num_ndp_ids; i++) @@ -1795,7 +1795,7 @@ static void os_if_ndp_end_ind_handler(struct wlan_objmgr_vdev *vdev, data_len, QCA_NL80211_VENDOR_SUBCMD_NDP_INDEX, GFP_ATOMIC); if (!vendor_event) { - cfg80211_err("cfg80211_vendor_event_alloc failed"); + osif_err("cfg80211_vendor_event_alloc failed"); return; } @@ -1813,7 +1813,7 @@ static void os_if_ndp_end_ind_handler(struct wlan_objmgr_vdev *vdev, return; ndp_end_ind_nla_failed: - cfg80211_err("nla_put api failed"); + osif_err("nla_put api failed"); kfree_skb(vendor_event); qdf_mem_free(ndp_instance_array); } @@ -1836,30 +1836,30 @@ static void os_if_new_peer_ind_handler(struct wlan_objmgr_vdev *vdev, struct nan_callbacks cb_obj; if (!peer_ind) { - cfg80211_err("Invalid new NDP peer params"); + osif_err("Invalid new NDP peer params"); return; } status = ucfg_nan_get_callbacks(psoc, &cb_obj); if (QDF_IS_STATUS_ERROR(status)) { - cfg80211_err("failed to get callbacks"); + osif_err("failed to get callbacks"); return; } - cfg80211_debug("vdev_id: %d, peer_mac: %pM, sta_id: %d", - vdev_id, peer_ind->peer_mac_addr.bytes, - peer_ind->sta_id); + osif_debug("vdev_id: %d, peer_mac: %pM, sta_id: %d", + vdev_id, peer_ind->peer_mac_addr.bytes, + peer_ind->sta_id); ret = cb_obj.new_peer_ind(vdev_id, peer_ind->sta_id, &peer_ind->peer_mac_addr, (active_peers == 0 ? true : false)); if (ret) { - cfg80211_err("new peer handling at HDD failed %d", ret); + osif_err("new peer handling at HDD failed %d", ret); return; } active_peers++; ucfg_nan_set_active_peers(vdev, active_peers); - cfg80211_debug("vdev_id: %d, num_peers: %d", vdev_id, active_peers); + osif_debug("vdev_id: %d, num_peers: %d", vdev_id, active_peers); } /** @@ -1880,17 +1880,17 @@ static void os_if_peer_departed_ind_handler(struct wlan_objmgr_vdev *vdev, status = ucfg_nan_get_callbacks(psoc, &cb_obj); if (QDF_IS_STATUS_ERROR(status)) { - cfg80211_err("failed to get callbacks"); + osif_err("failed to get callbacks"); return; } if (!peer_ind) { - cfg80211_err("Invalid new NDP peer params"); + osif_err("Invalid new NDP peer params"); return; } - cfg80211_debug("vdev_id: %d, peer_mac: %pM, sta_id: %d", - vdev_id, peer_ind->peer_mac_addr.bytes, - peer_ind->sta_id); + osif_debug("vdev_id: %d, peer_mac: %pM, sta_id: %d", + vdev_id, peer_ind->peer_mac_addr.bytes, + peer_ind->sta_id); active_peers--; ucfg_nan_set_active_peers(vdev, active_peers); cb_obj.peer_departed_ind(vdev_id, peer_ind->sta_id, @@ -1950,7 +1950,7 @@ static void os_if_ndp_iface_create_rsp_handler(struct wlan_objmgr_psoc *psoc, status = ucfg_nan_get_callbacks(psoc, &cb_obj); if (QDF_IS_STATUS_ERROR(status)) { - cfg80211_err("Couldn't get ballback object"); + osif_err("Couldn't get ballback object"); return; } @@ -1958,7 +1958,7 @@ static void os_if_ndp_iface_create_rsp_handler(struct wlan_objmgr_psoc *psoc, create_status = ndi_rsp->status; create_reason = ndi_rsp->reason; } else { - cfg80211_err("Invalid ndi create response"); + osif_err("Invalid ndi create response"); create_fail = true; } @@ -1971,7 +1971,7 @@ static void os_if_ndp_iface_create_rsp_handler(struct wlan_objmgr_psoc *psoc, QCA_NL80211_VENDOR_SUBCMD_NDP_INDEX, GFP_KERNEL); if (!vendor_event) { - cfg80211_err("cfg80211_vendor_event_alloc failed"); + osif_err("cfg80211_vendor_event_alloc failed"); create_fail = true; goto close_ndi; } @@ -1979,14 +1979,14 @@ static void os_if_ndp_iface_create_rsp_handler(struct wlan_objmgr_psoc *psoc, /* Sub vendor command */ if (nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD, QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_CREATE)) { - cfg80211_err("QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD put fail"); + osif_err("QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD put fail"); goto nla_put_failure; } /* Transaction id */ if (nla_put_u16(vendor_event, QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID, create_transaction_id)) { - cfg80211_err("VENDOR_ATTR_NDP_TRANSACTION_ID put fail"); + osif_err("VENDOR_ATTR_NDP_TRANSACTION_ID put fail"); goto nla_put_failure; } @@ -1994,7 +1994,7 @@ static void os_if_ndp_iface_create_rsp_handler(struct wlan_objmgr_psoc *psoc, if (nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE, create_status)) { - cfg80211_err("VENDOR_ATTR_NDP_DRV_RETURN_TYPE put fail"); + osif_err("VENDOR_ATTR_NDP_DRV_RETURN_TYPE put fail"); goto nla_put_failure; } @@ -2002,22 +2002,22 @@ static void os_if_ndp_iface_create_rsp_handler(struct wlan_objmgr_psoc *psoc, if (nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE, create_reason)) { - cfg80211_err("VENDOR_ATTR_NDP_DRV_RETURN_VALUE put fail"); + osif_err("VENDOR_ATTR_NDP_DRV_RETURN_VALUE put fail"); goto nla_put_failure; } - cfg80211_debug("sub command: %d, value: %d", - QCA_NL80211_VENDOR_SUBCMD_NDP, - QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_CREATE); - cfg80211_debug("create transaction id: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID, - create_transaction_id); - cfg80211_debug("status code: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE, - create_status); - cfg80211_debug("Return value: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE, - create_reason); + osif_debug("sub command: %d, value: %d", + QCA_NL80211_VENDOR_SUBCMD_NDP, + QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_CREATE); + osif_debug("create transaction id: %d, value: %d", + QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID, + create_transaction_id); + osif_debug("status code: %d, value: %d", + QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE, + create_status); + osif_debug("Return value: %d, value: %d", + QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE, + create_reason); cfg80211_vendor_event(vendor_event, GFP_KERNEL); @@ -2026,8 +2026,8 @@ static void os_if_ndp_iface_create_rsp_handler(struct wlan_objmgr_psoc *psoc, cb_obj.drv_ndi_create_rsp_handler(wlan_vdev_get_id(vdev), ndi_rsp); } else { - cfg80211_err("NDI interface creation failed with reason %d", - create_reason); + osif_err("NDI interface creation failed with reason %d", + create_reason); goto close_ndi; } @@ -2057,21 +2057,21 @@ static void os_if_ndp_iface_delete_rsp_handler(struct wlan_objmgr_psoc *psoc, struct nan_callbacks cb_obj; if (!ndi_rsp) { - cfg80211_err("Invalid ndi delete response"); + osif_err("Invalid ndi delete response"); return; } status = ucfg_nan_get_callbacks(psoc, &cb_obj); if (QDF_IS_STATUS_ERROR(status)) { - cfg80211_err("Couldn't get ballback object"); + osif_err("Couldn't get ballback object"); return; } if (ndi_rsp->status == NAN_DATAPATH_RSP_STATUS_SUCCESS) - cfg80211_debug("NDI BSS successfully stopped"); + osif_debug("NDI BSS successfully stopped"); else - cfg80211_debug("NDI BSS stop failed with reason %d", - ndi_rsp->reason); + osif_debug("NDI BSS stop failed with reason %d", + ndi_rsp->reason); ucfg_nan_set_ndi_delete_rsp_reason(vdev, ndi_rsp->reason); ucfg_nan_set_ndi_delete_rsp_status(vdev, ndi_rsp->status); @@ -2116,7 +2116,7 @@ static QDF_STATUS os_if_ndp_sch_update_pack_ch_info(struct sk_buff *event, int idx = 0; struct nlattr *ch_array, *ch_element; - cfg80211_debug("num_ch: %d", sch_update->num_channels); + osif_debug("num_ch: %d", sch_update->num_channels); if (!sch_update->num_channels) return QDF_STATUS_SUCCESS; @@ -2125,10 +2125,10 @@ static QDF_STATUS os_if_ndp_sch_update_pack_ch_info(struct sk_buff *event, return QDF_STATUS_E_FAULT; for (idx = 0; idx < sch_update->num_channels; idx++) { - cfg80211_debug("ch[%d]: freq: %d, width: %d, nss: %d", - idx, sch_update->ch[idx].freq, - sch_update->ch[idx].ch_width, - sch_update->ch[idx].nss); + osif_debug("ch[%d]: freq: %d, width: %d, nss: %d", + idx, sch_update->ch[idx].freq, + sch_update->ch[idx].ch_width, + sch_update->ch[idx].nss); ch_element = nla_nest_start(event, idx); if (!ch_element) return QDF_STATUS_E_FAULT; @@ -2174,18 +2174,18 @@ static void os_if_ndp_sch_update_ind_handler(struct wlan_objmgr_vdev *vdev, struct pdev_osif_priv *os_priv = wlan_pdev_get_ospriv(pdev); if (!sch_update) { - cfg80211_err("Invalid sch update params"); + osif_err("Invalid sch update params"); return; } ifname = os_if_ndi_get_if_name(vdev); if (!ifname) { - cfg80211_err("ifname is null"); + osif_err("ifname is null"); return; } ifname_len = qdf_str_len(ifname); if (ifname_len > IFNAMSIZ) { - cfg80211_err("ifname(%d) too long", ifname_len); + osif_err("ifname(%d) too long", ifname_len); return; } @@ -2194,7 +2194,7 @@ static void os_if_ndp_sch_update_ind_handler(struct wlan_objmgr_vdev *vdev, data_len, QCA_NL80211_VENDOR_SUBCMD_NDP_INDEX, GFP_ATOMIC); if (!vendor_event) { - cfg80211_err("cfg80211_vendor_event_alloc failed"); + osif_err("cfg80211_vendor_event_alloc failed"); return; } @@ -2225,18 +2225,18 @@ static void os_if_ndp_sch_update_ind_handler(struct wlan_objmgr_vdev *vdev, if (QDF_IS_STATUS_ERROR(status)) goto ndp_sch_ind_nla_failed; - cfg80211_debug("Flags: %d, num_instance_id: %d", sch_update->flags, - sch_update->num_ndp_instances); + osif_debug("Flags: %d, num_instance_id: %d", sch_update->flags, + sch_update->num_ndp_instances); for (idx = 0; idx < sch_update->num_ndp_instances; idx++) - cfg80211_debug("ndp_instance[%d]: %d", idx, - sch_update->ndp_instances[idx]); + osif_debug("ndp_instance[%d]: %d", idx, + sch_update->ndp_instances[idx]); cfg80211_vendor_event(vendor_event, GFP_ATOMIC); return; ndp_sch_ind_nla_failed: - cfg80211_err("nla_put api failed"); + osif_err("nla_put api failed"); kfree_skb(vendor_event); } @@ -2256,13 +2256,13 @@ static void os_if_ndp_host_update_handler(struct wlan_objmgr_vdev *vdev, vdev_nan_obj = nan_get_vdev_priv_obj(vdev); if (!vdev_nan_obj) { - cfg80211_err("vdev_nan_obj is NULL"); + osif_err("vdev_nan_obj is NULL"); return; } request = osif_request_get(vdev_nan_obj->disable_context); if (!request) { - cfg80211_debug("Obsolete request"); + osif_debug("Obsolete request"); return; } @@ -2333,7 +2333,7 @@ void os_if_nan_post_ndi_create_rsp(struct wlan_objmgr_psoc *psoc, psoc, vdev_id, WLAN_NAN_ID); if (!vdev) { - cfg80211_err("vdev is null"); + osif_err("vdev is null"); return; } @@ -2360,7 +2360,7 @@ void os_if_nan_post_ndi_delete_rsp(struct wlan_objmgr_psoc *psoc, struct wlan_objmgr_vdev *vdev = wlan_objmgr_get_vdev_by_id_from_psoc( psoc, vdev_id, WLAN_NAN_ID); if (!vdev) { - cfg80211_err("vdev is null"); + osif_err("vdev is null"); return; } @@ -2409,7 +2409,7 @@ void os_if_nan_ndi_session_end(struct wlan_objmgr_vdev *vdev) * to be informed in that case (response is not expected) */ if (NAN_DATA_NDI_DELETING_STATE != ucfg_nan_get_ndi_state(vdev)) { - cfg80211_err("NDI interface deleted"); + osif_err("NDI interface deleted"); return; } @@ -2420,21 +2420,21 @@ void os_if_nan_ndi_session_end(struct wlan_objmgr_vdev *vdev) GFP_KERNEL); if (!vendor_event) { - cfg80211_err("cfg80211_vendor_event_alloc failed"); + osif_err("cfg80211_vendor_event_alloc failed"); return; } /* Sub vendor command goes first */ if (nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD, QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_DELETE)) { - cfg80211_err("VENDOR_ATTR_NDP_SUBCMD put fail"); + osif_err("VENDOR_ATTR_NDP_SUBCMD put fail"); goto failure; } /* Transaction id */ if (nla_put_u16(vendor_event, QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID, ucfg_nan_get_ndp_delete_transaction_id(vdev))) { - cfg80211_err("VENDOR_ATTR_NDP_TRANSACTION_ID put fail"); + osif_err("VENDOR_ATTR_NDP_TRANSACTION_ID put fail"); goto failure; } @@ -2442,7 +2442,7 @@ void os_if_nan_ndi_session_end(struct wlan_objmgr_vdev *vdev) if (nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE, ucfg_nan_get_ndi_delete_rsp_status(vdev))) { - cfg80211_err("VENDOR_ATTR_NDP_DRV_RETURN_TYPE put fail"); + osif_err("VENDOR_ATTR_NDP_DRV_RETURN_TYPE put fail"); goto failure; } @@ -2450,22 +2450,22 @@ void os_if_nan_ndi_session_end(struct wlan_objmgr_vdev *vdev) if (nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE, ucfg_nan_get_ndi_delete_rsp_reason(vdev))) { - cfg80211_err("VENDOR_ATTR_NDP_DRV_RETURN_VALUE put fail"); + osif_err("VENDOR_ATTR_NDP_DRV_RETURN_VALUE put fail"); goto failure; } - cfg80211_debug("sub command: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD, - QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_DELETE); - cfg80211_debug("delete transaction id: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID, - ucfg_nan_get_ndp_delete_transaction_id(vdev)); - cfg80211_debug("status code: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE, - ucfg_nan_get_ndi_delete_rsp_status(vdev)); - cfg80211_debug("Return value: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE, - ucfg_nan_get_ndi_delete_rsp_reason(vdev)); + osif_debug("sub command: %d, value: %d", + QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD, + QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_DELETE); + osif_debug("delete transaction id: %d, value: %d", + QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID, + ucfg_nan_get_ndp_delete_transaction_id(vdev)); + osif_debug("status code: %d, value: %d", + QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE, + ucfg_nan_get_ndi_delete_rsp_status(vdev)); + osif_debug("Return value: %d, value: %d", + QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE, + ucfg_nan_get_ndi_delete_rsp_reason(vdev)); ucfg_nan_set_ndp_delete_transaction_id(vdev, 0); ucfg_nan_set_ndi_state(vdev, NAN_DATA_NDI_DELETED_STATE); @@ -2496,7 +2496,7 @@ static void os_if_nan_discovery_event_handler(struct nan_event_params *nan_evt) */ pdev = wlan_objmgr_get_pdev_by_id(nan_evt->psoc, 0, WLAN_NAN_ID); if (!pdev) { - cfg80211_err("null pdev"); + osif_err("null pdev"); return; } os_priv = wlan_pdev_get_ospriv(pdev); @@ -2508,13 +2508,13 @@ static void os_if_nan_discovery_event_handler(struct nan_event_params *nan_evt) GFP_KERNEL); if (!vendor_event) { - cfg80211_err("cfg80211_vendor_event_alloc failed"); + osif_err("cfg80211_vendor_event_alloc failed"); goto fail; } if (nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_NAN, nan_evt->buf_len, nan_evt->buf)) { - cfg80211_err("QCA_WLAN_VENDOR_ATTR_NAN put failed"); + osif_err("QCA_WLAN_VENDOR_ATTR_NAN put failed"); goto fail; } @@ -2542,7 +2542,7 @@ static int os_if_nan_generic_req(struct wlan_objmgr_psoc *psoc, nan_req = qdf_mem_malloc(sizeof(*nan_req) + buf_len); if (!nan_req) { - cfg80211_err("Request allocation failure"); + osif_err("Request allocation failure"); return -ENOMEM; } @@ -2551,13 +2551,13 @@ static int os_if_nan_generic_req(struct wlan_objmgr_psoc *psoc, nla_memcpy(nan_req->params.request_data, tb[QCA_WLAN_VENDOR_ATTR_NAN_CMD_DATA], buf_len); - cfg80211_debug("sending NAN Req"); + osif_debug("sending NAN Req"); status = ucfg_nan_discovery_req(nan_req, NAN_GENERIC_REQ); if (QDF_IS_STATUS_SUCCESS(status)) - cfg80211_debug("Successfully sent a NAN request"); + osif_debug("Successfully sent a NAN request"); else - cfg80211_err("Unable to send a NAN request"); + osif_err("Unable to send a NAN request"); qdf_mem_free(nan_req); return qdf_status_to_os_return(status); @@ -2570,7 +2570,7 @@ int os_if_nan_legacy_req(struct wlan_objmgr_psoc *psoc, const void *data, QDF_STATUS status; if (data_len > NAN_CMD_MAX_SIZE) { - cfg80211_err("NAN request exceeding max allowed size"); + osif_err("NAN request exceeding max allowed size"); return -EINVAL; } @@ -2590,7 +2590,7 @@ int os_if_nan_legacy_req(struct wlan_objmgr_psoc *psoc, const void *data, status = ucfg_nan_discovery_req(nan_req, NAN_GENERIC_REQ); if (QDF_IS_STATUS_ERROR(status)) - cfg80211_err("Failed to post NAN request"); + osif_err("Failed to post NAN request"); qdf_mem_free(nan_req); @@ -2608,7 +2608,7 @@ static int os_if_process_nan_disable_req(struct wlan_objmgr_psoc *psoc, nan_req = qdf_mem_malloc(sizeof(*nan_req) + buf_len); if (!nan_req) { - cfg80211_err("Request allocation failure"); + osif_err("Request allocation failure"); return -ENOMEM; } @@ -2619,13 +2619,13 @@ static int os_if_process_nan_disable_req(struct wlan_objmgr_psoc *psoc, nla_memcpy(nan_req->params.request_data, tb[QCA_WLAN_VENDOR_ATTR_NAN_CMD_DATA], buf_len); - cfg80211_debug("sending NAN Disable Req"); + osif_debug("sending NAN Disable Req"); status = ucfg_nan_discovery_req(nan_req, NAN_DISABLE_REQ); if (QDF_IS_STATUS_SUCCESS(status)) - cfg80211_debug("Successfully sent NAN Disable request"); + osif_debug("Successfully sent NAN Disable request"); else - cfg80211_err("Unable to send NAN Disable request"); + osif_err("Unable to send NAN Disable request"); qdf_mem_free(nan_req); return qdf_status_to_os_return(status); @@ -2641,7 +2641,7 @@ static int os_if_process_nan_enable_req(struct wlan_objmgr_psoc *psoc, struct nan_enable_req *nan_req; if (!tb[QCA_WLAN_VENDOR_ATTR_NAN_DISC_24GHZ_BAND_FREQ]) { - cfg80211_err("NAN Social channel for 2.4Gz is unavailable!"); + osif_err("NAN Social channel for 2.4Gz is unavailable!"); return -EINVAL; } chan_freq_2g = @@ -2654,8 +2654,8 @@ static int os_if_process_nan_enable_req(struct wlan_objmgr_psoc *psoc, nan_chan_2g = wlan_freq_to_chan(chan_freq_2g); if (!ucfg_is_nan_enable_allowed(psoc, nan_chan_2g)) { - cfg80211_err("NAN Enable not allowed at this moment for channel %d", - nan_chan_2g); + osif_err("NAN Enable not allowed at this moment for channel %d", + nan_chan_2g); return -EINVAL; } @@ -2664,7 +2664,7 @@ static int os_if_process_nan_enable_req(struct wlan_objmgr_psoc *psoc, nan_req = qdf_mem_malloc(sizeof(*nan_req) + buf_len); if (!nan_req) { - cfg80211_err("Request allocation failure"); + osif_err("Request allocation failure"); return -ENOMEM; } nan_req->social_chan_2g = wlan_freq_to_chan(chan_freq_2g); @@ -2676,13 +2676,13 @@ static int os_if_process_nan_enable_req(struct wlan_objmgr_psoc *psoc, nla_memcpy(nan_req->params.request_data, tb[QCA_WLAN_VENDOR_ATTR_NAN_CMD_DATA], buf_len); - cfg80211_debug("Sending NAN Enable Req"); + osif_debug("Sending NAN Enable Req"); status = ucfg_nan_discovery_req(nan_req, NAN_ENABLE_REQ); if (QDF_IS_STATUS_SUCCESS(status)) - cfg80211_debug("Successfully sent NAN Enable request"); + osif_debug("Successfully sent NAN Enable request"); else - cfg80211_err("Unable to send NAN Enable request"); + osif_err("Unable to send NAN Enable request"); qdf_mem_free(nan_req); return qdf_status_to_os_return(status); @@ -2696,12 +2696,12 @@ int os_if_process_nan_req(struct wlan_objmgr_psoc *psoc, if (wlan_cfg80211_nla_parse(tb, QCA_WLAN_VENDOR_ATTR_NAN_PARAMS_MAX, data, data_len, nan_attr_policy)) { - cfg80211_err("Invalid NAN vendor command attributes"); + osif_err("Invalid NAN vendor command attributes"); return -EINVAL; } if (!tb[QCA_WLAN_VENDOR_ATTR_NAN_CMD_DATA]) { - cfg80211_err("NAN cmd data missing!"); + osif_err("NAN cmd data missing!"); return -EINVAL; } @@ -2729,7 +2729,7 @@ int os_if_process_nan_req(struct wlan_objmgr_psoc *psoc, case QCA_WLAN_NAN_EXT_SUBCMD_TYPE_DISABLE_REQ: return os_if_process_nan_disable_req(psoc, tb); default: - cfg80211_err("Unrecognized NAN subcmd type(%d)", nan_subcmd); + osif_err("Unrecognized NAN subcmd type(%d)", nan_subcmd); return -EINVAL; } } diff --git a/os_if/p2p/src/wlan_cfg80211_p2p.c b/os_if/p2p/src/wlan_cfg80211_p2p.c index 652a1288f8b2..723246bc9786 100644 --- a/os_if/p2p/src/wlan_cfg80211_p2p.c +++ b/os_if/p2p/src/wlan_cfg80211_p2p.c @@ -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; } diff --git a/os_if/tdls/src/wlan_cfg80211_tdls.c b/os_if/tdls/src/wlan_cfg80211_tdls.c index de6de6ede556..c6abdc91d6be 100644 --- a/os_if/tdls/src/wlan_cfg80211_tdls.c +++ b/os_if/tdls/src/wlan_cfg80211_tdls.c @@ -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; }