UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFC: digital: Use NFC_NFCID3_MAXSIZE from nfc.h 

This removes the declaration of NFCID3 size in digital_dep.c and now
uses the one from nfc.h.

This also removes a faulty and unneeded call to max().

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Thierry Escande 2014-01-02 11:58:14 +01:00 committed by Samuel Ortiz
parent 67af1d7a0f
commit 4f319e3251
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/nfc/digital_dep.c
View File

@ -32,7 +32,6 @@
#define DIGITAL_ATR_REQ_MIN_SIZE 16 #define DIGITAL_ATR_REQ_MIN_SIZE 16
#define DIGITAL_ATR_REQ_MAX_SIZE 64 #define DIGITAL_ATR_REQ_MAX_SIZE 64
#define DIGITAL_NFCID3_LEN ((u8)8)
#define DIGITAL_LR_BITS_PAYLOAD_SIZE_254B 0x30 #define DIGITAL_LR_BITS_PAYLOAD_SIZE_254B 0x30
#define DIGITAL_GB_BIT 0x02 #define DIGITAL_GB_BIT 0x02
@ -206,10 +205,9 @@ int digital_in_send_atr_req(struct nfc_digital_dev *ddev,
atr_req->dir = DIGITAL_NFC_DEP_FRAME_DIR_OUT; atr_req->dir = DIGITAL_NFC_DEP_FRAME_DIR_OUT;
atr_req->cmd = DIGITAL_CMD_ATR_REQ; atr_req->cmd = DIGITAL_CMD_ATR_REQ;
if (target->nfcid2_len) if (target->nfcid2_len)
memcpy(atr_req->nfcid3, target->nfcid2, memcpy(atr_req->nfcid3, target->nfcid2, NFC_NFCID2_MAXSIZE);
max(target->nfcid2_len, DIGITAL_NFCID3_LEN));
else else
get_random_bytes(atr_req->nfcid3, DIGITAL_NFCID3_LEN); get_random_bytes(atr_req->nfcid3, NFC_NFCID3_MAXSIZE);
atr_req->did = 0; atr_req->did = 0;
atr_req->bs = 0; atr_req->bs = 0;