diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
commit | 7baca6ad0ef09c8a78d798c93a3ce25336e8f50f (patch) | |
tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /net/netrom/nr_subr.c | |
parent | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (diff) | |
parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) |
Merge branch 'master' into for_paulus
Diffstat (limited to 'net/netrom/nr_subr.c')
-rw-r--r-- | net/netrom/nr_subr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/nr_subr.c b/net/netrom/nr_subr.c index bcb9946b4f56..cfab5721a608 100644 --- a/net/netrom/nr_subr.c +++ b/net/netrom/nr_subr.c @@ -57,7 +57,7 @@ void nr_frames_acked(struct sock *sk, unsigned short nr) */ if (nrom->va != nr) { while (skb_peek(&nrom->ack_queue) != NULL && nrom->va != nr) { - skb = skb_dequeue(&nrom->ack_queue); + skb = skb_dequeue(&nrom->ack_queue); kfree_skb(skb); nrom->va = (nrom->va + 1) % NR_MODULUS; } |