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

Commit 1d816b6e authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

nfc: st-nci: Remove data from ack_pending_q when receiving a SYNC_ACK 



When receiving a NDLC PCB_SYNC_ACK the pending data was never
removed from ack_pending_q and cleared.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent daaf1e1f

drivers/nfc/st-nci/ndlc.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -171,6 +171,8 @@ static void llt_ndlc_rcv_queue(struct llt_ndlc *ndlc) 
		if ((pcb & PCB_TYPE_MASK) == PCB_TYPE_SUPERVISOR) {

		if ((pcb & PCB_TYPE_MASK) == PCB_TYPE_SUPERVISOR) {

			switch (pcb & PCB_SYNC_MASK) {

			switch (pcb & PCB_SYNC_MASK) {

			case PCB_SYNC_ACK:

			case PCB_SYNC_ACK:

				skb = skb_dequeue(&ndlc->ack_pending_q);

				kfree_skb(skb);

				del_timer_sync(&ndlc->t1_timer);

				del_timer_sync(&ndlc->t1_timer);

				del_timer_sync(&ndlc->t2_timer);

				del_timer_sync(&ndlc->t2_timer);

				ndlc->t2_active = false;

				ndlc->t2_active = false;