Patchwork : ppp_generic: Use skb_peek() in ppp_receive_mp_frame().

login
register
mail settings
Submitter David Miller
Date Sept. 23, 2008, 8:34 a.m.
Message ID <20080923.013446.239958956.davem@davemloft.net>
Download mbox | patch
Permalink /patch/1034/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - Sept. 23, 2008, 8:34 a.m.
I'm going to try and take baby steps with these conversions
in PPP.

ppp_generic: Use skb_peek() in ppp_receive_mp_frame().

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/ppp_generic.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 98e0495..5d4d215 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1833,9 +1833,11 @@  ppp_receive_mp_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
 
 	/* If the queue is getting long, don't wait any longer for packets
 	   before the start of the queue. */
-	if (skb_queue_len(&ppp->mrq) >= PPP_MP_MAX_QLEN
-	    && seq_before(ppp->minseq, ppp->mrq.next->sequence))
-		ppp->minseq = ppp->mrq.next->sequence;
+	if (skb_queue_len(&ppp->mrq) >= PPP_MP_MAX_QLEN) {
+		struct sk_buff *skb = skb_peek(&ppp->mrq);
+		if (seq_before(ppp->minseq, skb->sequence))
+			ppp->minseq = skb->sequence;
+	}
 
 	/* Pull completed packets off the queue and receive them. */
 	while ((skb = ppp_mp_reconstruct(ppp)))