diff options
| author | Eric Lapuyade <eric.lapuyade@intel.com> | 2012-06-11 13:36:52 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:42:06 -0400 |
| commit | 72b06f75fea45fa861f2e137bc94e56aab306c4b (patch) | |
| tree | 472f0c25fd48b7b11aeaa4880e22af0f045e30d6 /net/nfc | |
| parent | 1c215d79a18a22fc6c2a9ef8658d426bac492b58 (diff) | |
| download | linux-stable-72b06f75fea45fa861f2e137bc94e56aab306c4b.tar.gz linux-stable-72b06f75fea45fa861f2e137bc94e56aab306c4b.tar.bz2 linux-stable-72b06f75fea45fa861f2e137bc94e56aab306c4b.zip | |
NFC: Implement HCP reaggregation allocation error case
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>
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/hci/core.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c index 1a009d554fd7..7d4fdbc06a98 100644 --- a/net/nfc/hci/core.c +++ b/net/nfc/hci/core.c @@ -717,12 +717,18 @@ void *nfc_hci_get_clientdata(struct nfc_hci_dev *hdev) } 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 */ } + +void nfc_hci_driver_failure(struct nfc_hci_dev *hdev, int err) +{ + nfc_hci_failure(hdev, err); +} EXPORT_SYMBOL(nfc_hci_driver_failure); 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 + msg_len, GFP_KERNEL); if (hcp_skb == NULL) { - /* TODO ELa: cannot deliver HCP message. How to - * propagate error up? - */ + nfc_hci_failure(hdev, -ENOMEM); + return; } *skb_put(hcp_skb, NFC_HCI_HCP_PACKET_HEADER_LEN) = pipe; |