lkml.org 
[lkml]   [2015]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2 006/134] nfc: st-nci: Remove data from ack_pending_q when receiving a SYNC_ACK
    Date
    4.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christophe Ricard <christophe.ricard@gmail.com>

    commit 1d816b6eb513498aa28a0ff1e4db7632bded1707 upstream.

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

    Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/nfc/st-nci/ndlc.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/drivers/nfc/st-nci/ndlc.c
    +++ b/drivers/nfc/st-nci/ndlc.c
    @@ -171,6 +171,8 @@ static void llt_ndlc_rcv_queue(struct ll
    if ((pcb & PCB_TYPE_MASK) == PCB_TYPE_SUPERVISOR) {
    switch (pcb & PCB_SYNC_MASK) {
    case PCB_SYNC_ACK:
    + skb = skb_dequeue(&ndlc->ack_pending_q);
    + kfree_skb(skb);
    del_timer_sync(&ndlc->t1_timer);
    del_timer_sync(&ndlc->t2_timer);
    ndlc->t2_active = false;



    \
     
     \ /
      Last update: 2015-09-27 00:41    [W:4.135 / U:0.564 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site