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

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

NFC: digital: Rework ACK PDU handling in initiator mode 



With this patch, ACK PDU sk_buffs are now freed and code has been
refactored for better errors handling.

Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 482333b2

net/nfc/digital_dep.c

+27 −13
Original line number Diff line number Diff line
@@ -782,6 +782,12 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg, 
		break;



	case DIGITAL_NFC_DEP_PFB_ACK_NACK_PDU:

		if (DIGITAL_NFC_DEP_NACK_BIT_SET(pfb)) {

			PROTOCOL_ERR("14.12.4.5");

			rc = -EIO;

			goto exit;

		}



		if (DIGITAL_NFC_DEP_PFB_PNI(pfb) != ddev->curr_nfc_dep_pni) {

			PROTOCOL_ERR("14.12.3.3");

			rc = -EIO;
@@ -791,7 +797,15 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg, 
		ddev->curr_nfc_dep_pni =

			DIGITAL_NFC_DEP_PFB_PNI(ddev->curr_nfc_dep_pni + 1);



		if (ddev->chaining_skb && !DIGITAL_NFC_DEP_NACK_BIT_SET(pfb)) {

		if (!ddev->chaining_skb) {

			PROTOCOL_ERR("14.12.4.3");

			rc = -EIO;

			goto exit;

		}



		/* The initiator has received a valid ACK. Free the last sent

		 * PDU and keep on sending chained skb.

		 */

		kfree_skb(ddev->saved_skb);

		ddev->saved_skb = NULL;
@@ -801,12 +815,7 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg, 
		if (rc)

			goto error;



			return;

		}



		pr_err("Received a ACK/NACK PDU\n");

		rc = -EINVAL;

		goto exit;

		goto free_resp;



	case DIGITAL_NFC_DEP_PFB_SUPERVISOR_PDU:

		if (!DIGITAL_NFC_DEP_PFB_IS_TIMEOUT(pfb)) { /* ATN */
@@ -839,6 +848,11 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg, 


	if (rc)

		kfree_skb(resp);



	return;



free_resp:

	dev_kfree_skb(resp);

}



int digital_in_send_dep_req(struct nfc_digital_dev *ddev,