diff options
| author | Eric Lapuyade <eric.lapuyade@linux.intel.com> | 2013-09-23 17:56:31 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-09-25 14:25:41 +0200 |
| commit | 22d4aae5897fb8355130b8f7d9a3af153eac9714 (patch) | |
| tree | b11eb743ff1f9a816875b43237ae51f28695b421 /include/net/nfc | |
| parent | a4ada6cadb8a2246f263ff6a0d0cca8832f3970e (diff) | |
| download | linux-stable-22d4aae5897fb8355130b8f7d9a3af153eac9714.tar.gz linux-stable-22d4aae5897fb8355130b8f7d9a3af153eac9714.tar.bz2 linux-stable-22d4aae5897fb8355130b8f7d9a3af153eac9714.zip | |
NFC: NCI: nci_spi_recv_frame() now returns (not forward) the read frame
Previously, nci_spi_recv_frame() would directly transmit incoming frames
to the NCI Core. However, it turns out that some NFC NCI Chips will add
additional proprietary headers that must be handled/removed before NCI
Core gets a chance to handle the frame. With this modification, the chip
phy or driver are now responsible to transmit incoming frames to NCI
Core after proper treatment, and NCI SPI becomes a driver helper instead
of sitting between the NFC driver and NCI Core.
As a general rule in NFC, *_recv_frame() APIs are used to deliver an
incoming frame to an upper layer. To better suit the actual purpose of
nci_spi_recv_frame(), and go along with its nci_spi_send()
counterpart, the function is renamed to nci_spi_read()
The skb is returned as the function result
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/net/nfc')
| -rw-r--r-- | include/net/nfc/nci_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h index 37ba06f2dfa9..1d505317dc67 100644 --- a/include/net/nfc/nci_core.h +++ b/include/net/nfc/nci_core.h @@ -233,6 +233,6 @@ struct nci_spi *nci_spi_allocate_spi(struct spi_device *spi, u8 acknowledge_mode, unsigned int delay, struct nci_dev *ndev); int nci_spi_send(struct nci_spi *nspi, struct sk_buff *skb); -int nci_spi_recv_frame(struct nci_spi *nspi); +struct sk_buff *nci_spi_read(struct nci_spi *nspi); #endif /* __NCI_CORE_H */ |