leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFC: Fix next target_idx type and rename for clarity

Browse Source 
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>
This commit is contained in:
Eric Lapuyade 2012-04-10 19:43:10 +02:00 committed by John W. Linville
parent c4fbb6515a
commit 01ae0eea9b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/nfc/nfc.h
View File

@ -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;

2
net/nfc/core.c
View File

@ -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);

4
net/nfc/rawsock.c
View File

@ -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;
}