diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-21 11:28:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-21 11:28:38 -0700 |
| commit | e0ea1373cc34136a2bf895d3051e73119553060e (patch) | |
| tree | f12b33696fe57e432596e3012528ddb218fb9539 /utils | |
| parent | e09994c0ede6c1ce15d603da39ec817f6a9e9473 (diff) | |
| parent | 1d1801c53dbc82094d528eba77b1e0c0a0e67b6d (diff) | |
| download | qca-wfi-host-cmn-e0ea1373cc34136a2bf895d3051e73119553060e.tar.gz | |
Merge "qcacmn: add useful debug prints"
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/nlink/src/wlan_nlink_srv.c | 14 | ||||
| -rw-r--r-- | utils/pktlog/linux_ac.c | 17 |
2 files changed, 17 insertions, 14 deletions
diff --git a/utils/nlink/src/wlan_nlink_srv.c b/utils/nlink/src/wlan_nlink_srv.c index 4be9b17dc..2c7d56a94 100644 --- a/utils/nlink/src/wlan_nlink_srv.c +++ b/utils/nlink/src/wlan_nlink_srv.c @@ -493,22 +493,17 @@ int nl_srv_bcast(struct sk_buff *skb, int mcgroup_id, int app_id) struct nlmsghdr *nlh = (struct nlmsghdr *)skb->data; void *msg = NLMSG_DATA(nlh); uint32_t msg_len = nlmsg_len(nlh); - uint8_t *tempbuf; int status; - tempbuf = (uint8_t *)qdf_mem_malloc(msg_len); - qdf_mem_copy(tempbuf, msg, msg_len); - status = send_msg_to_cld80211(mcgroup_id, 0, app_id, tempbuf, msg_len); + status = send_msg_to_cld80211(mcgroup_id, 0, app_id, msg, msg_len); if (status) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "send msg to cld80211 fails for app id %d", app_id); dev_kfree_skb(skb); - qdf_mem_free(tempbuf); return -EPERM; } dev_kfree_skb(skb); - qdf_mem_free(tempbuf); return 0; } qdf_export_symbol(nl_srv_bcast); @@ -534,23 +529,18 @@ int nl_srv_ucast(struct sk_buff *skb, int dst_pid, int flag, struct nlmsghdr *nlh = (struct nlmsghdr *)skb->data; void *msg = NLMSG_DATA(nlh); uint32_t msg_len = nlmsg_len(nlh); - uint8_t *tempbuf; int status; - tempbuf = (uint8_t *)qdf_mem_malloc(msg_len); - qdf_mem_copy(tempbuf, msg, msg_len); status = send_msg_to_cld80211(mcgroup_id, dst_pid, app_id, - tempbuf, msg_len); + msg, msg_len); if (status) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "send msg to cld80211 fails for app id %d", app_id); dev_kfree_skb(skb); - qdf_mem_free(tempbuf); return -EPERM; } dev_kfree_skb(skb); - qdf_mem_free(tempbuf); return 0; } #else diff --git a/utils/pktlog/linux_ac.c b/utils/pktlog/linux_ac.c index 7e0aab5d5..5f7af3061 100644 --- a/utils/pktlog/linux_ac.c +++ b/utils/pktlog/linux_ac.c @@ -1003,7 +1003,8 @@ static inline unsigned long pktlog_get_fault_address(struct vm_fault *vmf) } #endif /* KERNEL_VERSION(4, 10, 0) */ -static int pktlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +static int +pktlog_fault_handler(struct vm_area_struct *vma, struct vm_fault *vmf) { unsigned long address = pktlog_get_fault_address(vmf); @@ -1018,8 +1019,20 @@ static int pktlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf) return 0; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) +static int pktlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +{ + return pktlog_fault_handler(vma, vmf); +} +#else +static int pktlog_fault(struct vm_fault *vmf) +{ + return pktlog_fault_handler(vmf->vma, vmf); +} +#endif + static struct vm_operations_struct pktlog_vmops = { - open: pktlog_vopen, + open: pktlog_vopen, close:pktlog_vclose, fault:pktlog_fault, }; |