diff options
| author | Julien Lefrique <lefrique@marvell.com> | 2014-10-21 16:52:49 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-11-28 14:07:51 +0100 |
| commit | 122c195872e963c83f3a61dcab0937247b56786e (patch) | |
| tree | 8e467ac9d976ea274e6e6ea2f1c6ec5a77667258 /net | |
| parent | 485f442fd5e3ba16b47df0e111165eabcf7ce96d (diff) | |
| download | talos-obmc-linux-122c195872e963c83f3a61dcab0937247b56786e.tar.gz talos-obmc-linux-122c195872e963c83f3a61dcab0937247b56786e.zip | |
NFC: NCI: Forward data received in Target mode to nfc core
Signed-off-by: Julien Lefrique <lefrique@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/nfc/nci/data.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c index 427ef2c7ab68..91f5d55bd04c 100644 --- a/net/nfc/nci/data.c +++ b/net/nfc/nci/data.c @@ -3,6 +3,7 @@ * NFC Controller (NFCC) and a Device Host (DH). * * Copyright (C) 2011 Texas Instruments, Inc. + * Copyright (C) 2014 Marvell International Ltd. * * Written by Ilan Elias <ilane@ti.com> * @@ -223,7 +224,17 @@ static void nci_add_rx_data_frag(struct nci_dev *ndev, } exit: - nci_data_exchange_complete(ndev, skb, err); + if (ndev->nfc_dev->rf_mode == NFC_RF_INITIATOR) { + nci_data_exchange_complete(ndev, skb, err); + } else if (ndev->nfc_dev->rf_mode == NFC_RF_TARGET) { + /* Data received in Target mode, forward to nfc core */ + err = nfc_tm_data_received(ndev->nfc_dev, skb); + if (err) + pr_err("unable to handle received data\n"); + } else { + pr_err("rf mode unknown\n"); + kfree_skb(skb); + } } /* Rx Data packet */ |
