---

yaml --- r: 289979 b: refs/heads/master c: 25a1d9d h: refs/heads/master i: 289977: 21d1bc0 289975: 51c1a02 v: v3
git-mirror · Jan 24, 2012 · e081dfd · e081dfd
1 parent f00edf1
commit e081dfd
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8939e47fc953cce6ef53e79e9ff9b53319d1a72d
+refs/heads/master: 25a1d9dc850b1bdcc4760eb625f0a67057f54d26
diff --git a/trunk/include/net/nfc/nfc.h b/trunk/include/net/nfc/nfc.h
@@ -87,7 +87,6 @@ struct nfc_genl_data {
 
 struct nfc_dev {
 	unsigned idx;
-	unsigned target_idx;
 	struct nfc_target *targets;
 	int n_targets;
 	int targets_generation;

diff --git a/trunk/net/nfc/core.c b/trunk/net/nfc/core.c
@@ -431,15 +431,10 @@ EXPORT_SYMBOL(nfc_alloc_recv_skb);
 int nfc_targets_found(struct nfc_dev *dev, struct nfc_target *targets,
 							int n_targets)
 {
-	int i;
-
 	pr_debug("dev_name=%s n_targets=%d\n", dev_name(&dev->dev), n_targets);
 
 	dev->polling = false;
 
-	for (i = 0; i < n_targets; i++)
-		targets[i].idx = dev->target_idx++;
-
 	spin_lock_bh(&dev->targets_lock);
 
 	dev->targets_generation++;

diff --git a/trunk/net/nfc/rawsock.c b/trunk/net/nfc/rawsock.c
@@ -92,18 +92,6 @@ static int rawsock_connect(struct socket *sock, struct sockaddr *_addr,
 		goto error;
 	}
 
-	if (addr->target_idx > dev->target_idx - 1 ||
-		addr->target_idx < dev->target_idx - dev->n_targets) {
-		rc = -EINVAL;
-		goto error;
-	}
-
-	if (addr->target_idx > dev->target_idx - 1 ||
-		addr->target_idx < dev->target_idx - dev->n_targets) {
-		rc = -EINVAL;
-		goto error;
-	}
-
 	rc = nfc_activate_target(dev, addr->target_idx, addr->nfc_protocol);
 	if (rc)
 		goto put_dev;