]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ppp: eliminate shadowed variable name
authorstephen hemminger <shemminger@vyatta.com>
Tue, 1 Jun 2010 06:05:46 +0000 (06:05 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Jun 2010 12:16:23 +0000 (05:16 -0700)
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>
drivers/net/ppp_generic.c

index 0db38946bc0a93b9b13f953b17b0182a0b321ddd..e38f603a71f109d850a2494b9195e6435dc9686f 100644 (file)
@@ -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. */