diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-16 15:55:48 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-06-04 21:34:30 +0200 |
| commit | be9ae4ce4ee66e211815122ab4f41913efed4fec (patch) | |
| tree | 157edfc0f57ab39fe14e1b7f994378da5a91b649 /net/nfc/nci | |
| parent | f212ad5e993e7efb996fc8ce94a5de8f0bd06d41 (diff) | |
| download | blackbird-op-linux-be9ae4ce4ee66e211815122ab4f41913efed4fec.tar.gz blackbird-op-linux-be9ae4ce4ee66e211815122ab4f41913efed4fec.zip | |
NFC: Introduce target mode tx ops
And rename the initiator mode data exchange ops for consistency sake.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/nci')
| -rw-r--r-- | net/nfc/nci/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 0f718982f808..766a02b1dfa1 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -522,9 +522,9 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev, } } -static int nci_data_exchange(struct nfc_dev *nfc_dev, struct nfc_target *target, - struct sk_buff *skb, - data_exchange_cb_t cb, void *cb_context) +static int nci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target, + struct sk_buff *skb, + data_exchange_cb_t cb, void *cb_context) { struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); int rc; @@ -557,7 +557,7 @@ static struct nfc_ops nci_nfc_ops = { .stop_poll = nci_stop_poll, .activate_target = nci_activate_target, .deactivate_target = nci_deactivate_target, - .data_exchange = nci_data_exchange, + .im_transceive = nci_transceive, }; /* ---- Interface to NCI drivers ---- */ |
