aboutsummaryrefslogtreecommitdiffstats
path: root/net/nfc/nci
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-05-16 09:55:48 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-06-04 15:34:30 -0400
commitbe9ae4ce4ee66e211815122ab4f41913efed4fec (patch)
tree157edfc0f57ab39fe14e1b7f994378da5a91b649 /net/nfc/nci
parentf212ad5e993e7efb996fc8ce94a5de8f0bd06d41 (diff)
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.c8
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,
522 } 522 }
523} 523}
524 524
525static int nci_data_exchange(struct nfc_dev *nfc_dev, struct nfc_target *target, 525static int nci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target,
526 struct sk_buff *skb, 526 struct sk_buff *skb,
527 data_exchange_cb_t cb, void *cb_context) 527 data_exchange_cb_t cb, void *cb_context)
528{ 528{
529 struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); 529 struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
530 int rc; 530 int rc;
@@ -557,7 +557,7 @@ static struct nfc_ops nci_nfc_ops = {
557 .stop_poll = nci_stop_poll, 557 .stop_poll = nci_stop_poll,
558 .activate_target = nci_activate_target, 558 .activate_target = nci_activate_target,
559 .deactivate_target = nci_deactivate_target, 559 .deactivate_target = nci_deactivate_target,
560 .data_exchange = nci_data_exchange, 560 .im_transceive = nci_transceive,
561}; 561};
562 562
563/* ---- Interface to NCI drivers ---- */ 563/* ---- Interface to NCI drivers ---- */