aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/nfc/nfc.h1
-rw-r--r--net/nfc/core.c39
2 files changed, 40 insertions, 0 deletions
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index bac070bf3514..57ea09533ae1 100644
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -181,6 +181,7 @@ int nfc_set_remote_general_bytes(struct nfc_dev *dev,
181 181
182int nfc_targets_found(struct nfc_dev *dev, 182int nfc_targets_found(struct nfc_dev *dev,
183 struct nfc_target *targets, int ntargets); 183 struct nfc_target *targets, int ntargets);
184int nfc_target_lost(struct nfc_dev *dev, u32 target_idx);
184 185
185int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, 186int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
186 u8 comm_mode, u8 rf_mode); 187 u8 comm_mode, u8 rf_mode);
diff --git a/net/nfc/core.c b/net/nfc/core.c
index 295d129864d2..deb4721ce8a1 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -455,6 +455,45 @@ int nfc_targets_found(struct nfc_dev *dev,
455} 455}
456EXPORT_SYMBOL(nfc_targets_found); 456EXPORT_SYMBOL(nfc_targets_found);
457 457
458int nfc_target_lost(struct nfc_dev *dev, u32 target_idx)
459{
460 struct nfc_target *tg;
461 int i;
462
463 pr_debug("dev_name %s n_target %d\n", dev_name(&dev->dev), target_idx);
464
465 spin_lock_bh(&dev->targets_lock);
466
467 for (i = 0; i < dev->n_targets; i++) {
468 tg = &dev->targets[i];
469 if (tg->idx == target_idx)
470 break;
471 }
472
473 if (i == dev->n_targets) {
474 spin_unlock_bh(&dev->targets_lock);
475 return -EINVAL;
476 }
477
478 dev->targets_generation++;
479 dev->n_targets--;
480
481 if (dev->n_targets) {
482 memcpy(&dev->targets[i], &dev->targets[i + 1],
483 (dev->n_targets - i) * sizeof(struct nfc_target));
484 } else {
485 kfree(dev->targets);
486 dev->targets = NULL;
487 }
488
489 spin_unlock_bh(&dev->targets_lock);
490
491 nfc_genl_target_lost(dev, target_idx);
492
493 return 0;
494}
495EXPORT_SYMBOL(nfc_target_lost);
496
458static void nfc_release(struct device *d) 497static void nfc_release(struct device *d)
459{ 498{
460 struct nfc_dev *dev = to_nfc_dev(d); 499 struct nfc_dev *dev = to_nfc_dev(d);