From d455177f15b2757e40d4dbb8cb75a508dda89da0 Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Tue, 3 Jun 2008 14:53:46 -0700 Subject: [PATCH] --- yaml --- r: 97631 b: refs/heads/master c: 7dccf1f4e1696c79bff064c3770867cc53cbc71c h: refs/heads/master i: 97629: 322dd169ef3f4a1724a667b14a61cfea9ed19a03 97627: 7453d22ac4697e98e49cad928529706685c6be21 97623: faed5b98a842ee05814424ec3707d52617ac4edc 97615: c8f8390ff4a40d9efc6925c146b23c4957e0e912 97599: 51947494a9aa49b0bee0a46ece2879059adfb53c v: v3 --- [refs] | 2 +- trunk/net/ax25/ax25_subr.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 593d456cbef6..243ada86f904 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 537d59af73d894750cff14f90fe2b6d77fbab15b +refs/heads/master: 7dccf1f4e1696c79bff064c3770867cc53cbc71c diff --git a/trunk/net/ax25/ax25_subr.c b/trunk/net/ax25/ax25_subr.c index d8f215733175..034aa10a5198 100644 --- a/trunk/net/ax25/ax25_subr.c +++ b/trunk/net/ax25/ax25_subr.c @@ -64,20 +64,15 @@ void ax25_frames_acked(ax25_cb *ax25, unsigned short nr) void ax25_requeue_frames(ax25_cb *ax25) { - struct sk_buff *skb, *skb_prev = NULL; + struct sk_buff *skb; /* * Requeue all the un-ack-ed frames on the output queue to be picked * up by ax25_kick called from the timer. This arrangement handles the * possibility of an empty output queue. */ - while ((skb = skb_dequeue(&ax25->ack_queue)) != NULL) { - if (skb_prev == NULL) - skb_queue_head(&ax25->write_queue, skb); - else - skb_append(skb_prev, skb, &ax25->write_queue); - skb_prev = skb; - } + while ((skb = skb_dequeue_tail(&ax25->ack_queue)) != NULL) + skb_queue_head(&ax25->write_queue, skb); } /*