Ver Fonte

NFC: Fix next target_idx type and rename for clarity

Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Eric Lapuyade há 13 anos atrás
pai
commit
01ae0eea9b
3 ficheiros alterados com 4 adições e 4 exclusões
  1. 1 1
      include/net/nfc/nfc.h
  2. 1 1
      net/nfc/core.c
  3. 2 2
      net/nfc/rawsock.c

+ 1 - 1
include/net/nfc/nfc.h

@@ -89,7 +89,7 @@ struct nfc_genl_data {
 
 struct nfc_dev {
 	unsigned idx;
-	unsigned target_idx;
+	u32 target_next_idx;
 	struct nfc_target *targets;
 	int n_targets;
 	int targets_generation;

+ 1 - 1
net/nfc/core.c

@@ -435,7 +435,7 @@ int nfc_targets_found(struct nfc_dev *dev,
 	dev->polling = false;
 
 	for (i = 0; i < n_targets; i++)
-		targets[i].idx = dev->target_idx++;
+		targets[i].idx = dev->target_next_idx++;
 
 	spin_lock_bh(&dev->targets_lock);
 

+ 2 - 2
net/nfc/rawsock.c

@@ -92,8 +92,8 @@ 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) {
+	if (addr->target_idx > dev->target_next_idx - 1 ||
+	    addr->target_idx < dev->target_next_idx - dev->n_targets) {
 		rc = -EINVAL;
 		goto error;
 	}