From 0b07dd714c0c60fcc4f363918d125a920bc83954 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Tue, 1 Jun 2010 06:05:46 +0000 Subject: [PATCH] --- yaml --- r: 202640 b: refs/heads/master c: c6b20d941b08941bece53bc3d857beb1fb25fffc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ppp_generic.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4f50e3bfcc90..23113071416d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38454db3f0b694df929073a5a867edf30551d950 +refs/heads/master: c6b20d941b08941bece53bc3d857beb1fb25fffc diff --git a/trunk/drivers/net/ppp_generic.c b/trunk/drivers/net/ppp_generic.c index 0db38946bc0a..e38f603a71f1 100644 --- a/trunk/drivers/net/ppp_generic.c +++ b/trunk/drivers/net/ppp_generic.c @@ -1927,9 +1927,9 @@ 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) { - struct sk_buff *skb = skb_peek(&ppp->mrq); - if (seq_before(ppp->minseq, skb->sequence)) - ppp->minseq = skb->sequence; + struct sk_buff *mskb = skb_peek(&ppp->mrq); + if (seq_before(ppp->minseq, mskb->sequence)) + ppp->minseq = mskb->sequence; } /* Pull completed packets off the queue and receive them. */