summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2010-06-01 06:05:46 +0000
committerDavid S. Miller <davem@davemloft.net>2010-06-02 05:16:23 -0700
commitc6b20d941b08941bece53bc3d857beb1fb25fffc (patch)
tree38c52bebd82f27c5e36ec9ef5c1f402400c6339b
parent38454db3f0b694df929073a5a867edf30551d950 (diff)
downloadlinux-3.10-c6b20d941b08941bece53bc3d857beb1fb25fffc.tar.gz
linux-3.10-c6b20d941b08941bece53bc3d857beb1fb25fffc.tar.bz2
linux-3.10-c6b20d941b08941bece53bc3d857beb1fb25fffc.zip
ppp: eliminate shadowed variable name
Sparse complains about shadowed declaration of skb. So use other name. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ppp_generic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 0db38946bc0..e38f603a71f 100644
--- a/drivers/net/ppp_generic.c
+++ b/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. */