lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFC: Implement HCP reaggregation allocation error case

Browse Source 
We can now report an ENOMEM error up to the HCI layer.

Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Eric Lapuyade
2012-06-11 13:36:52 +02:00
committed by John W. Linville
parent 1c215d79a1
commit 72b06f75fe
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net/nfc/hci/core.c
View File

@ -717,12 +717,18 @@ void *nfc_hci_get_clientdata(struct nfc_hci_dev *hdev)
} }
EXPORT_SYMBOL(nfc_hci_get_clientdata); EXPORT_SYMBOL(nfc_hci_get_clientdata);
void nfc_hci_driver_failure(struct nfc_hci_dev *hdev, int err) static void nfc_hci_failure(struct nfc_hci_dev *hdev, int err)
{ {
/* TODO: lower layer has permanent failure. /*
* TODO: lower layer has permanent failure.
* complete potential HCI command or send an empty tag discovered event * complete potential HCI command or send an empty tag discovered event
*/ */
} }
void nfc_hci_driver_failure(struct nfc_hci_dev *hdev, int err)
{
nfc_hci_failure(hdev, err);
}
EXPORT_SYMBOL(nfc_hci_driver_failure); EXPORT_SYMBOL(nfc_hci_driver_failure);
void nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb) void nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb)
@ -755,9 +761,8 @@ void nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb)
hcp_skb = nfc_alloc_recv_skb(NFC_HCI_HCP_PACKET_HEADER_LEN + hcp_skb = nfc_alloc_recv_skb(NFC_HCI_HCP_PACKET_HEADER_LEN +
msg_len, GFP_KERNEL); msg_len, GFP_KERNEL);
if (hcp_skb == NULL) { if (hcp_skb == NULL) {
/* TODO ELa: cannot deliver HCP message. How to nfc_hci_failure(hdev, -ENOMEM);
* propagate error up? return;
*/
} }
*skb_put(hcp_skb, NFC_HCI_HCP_PACKET_HEADER_LEN) = pipe; *skb_put(hcp_skb, NFC_HCI_HCP_PACKET_HEADER_LEN) = pipe;