diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-23 01:17:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-23 01:17:18 -0700 |
| commit | 38ce7c736916293b7ce09cd6a2133894fe2cec52 (patch) | |
| tree | 79b48411bbc7edf60bc77913489e2ab2a52a5bdf | |
| parent | f72051b0674f36c960698653a0583edaec1e495e (diff) | |
| download | linux-3.10-38ce7c736916293b7ce09cd6a2133894fe2cec52.tar.gz linux-3.10-38ce7c736916293b7ce09cd6a2133894fe2cec52.tar.bz2 linux-3.10-38ce7c736916293b7ce09cd6a2133894fe2cec52.zip | |
ppp_generic: Use skb_peek() in ppp_receive_mp_frame().
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ppp_generic.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 98e04958fef..5d4d21516a6 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))) |