Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 97631
b: refs/heads/master
c: 7dccf1f
h: refs/heads/master
i:
  97629: 322dd16
  97627: 7453d22
  97623: faed5b9
  97615: c8f8390
  97599: 5194749
v: v3
  • Loading branch information
Jarek Poplawski authored and David S. Miller committed Jun 3, 2008
1 parent c686d38 commit d455177
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 537d59af73d894750cff14f90fe2b6d77fbab15b
refs/heads/master: 7dccf1f4e1696c79bff064c3770867cc53cbc71c
11 changes: 3 additions & 8 deletions trunk/net/ax25/ax25_subr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit d455177

Please sign in to comment.