Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f319e32 authored by Thierry Escande's avatar Thierry Escande Committed by Samuel Ortiz
Browse files

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarThierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 67af1d7a

net/nfc/digital_dep.c

+2 −4
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#define DIGITAL_ATR_REQ_MIN_SIZE 16

#define DIGITAL_ATR_REQ_MAX_SIZE 64



#define DIGITAL_NFCID3_LEN ((u8)8)

#define DIGITAL_LR_BITS_PAYLOAD_SIZE_254B 0x30

#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->cmd = DIGITAL_CMD_ATR_REQ;

	if (target->nfcid2_len)

		memcpy(atr_req->nfcid3, target->nfcid2,

		       max(target->nfcid2_len, DIGITAL_NFCID3_LEN));

		memcpy(atr_req->nfcid3, target->nfcid2, NFC_NFCID2_MAXSIZE);

	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->bs = 0;