Patchwork ppp: eliminate shadowed variable name

login
register
mail settings
Submitter stephen hemminger
Date June 1, 2010, 4:05 p.m.
Message ID <20100601090546.79c1fca0@nehalam>
Download mbox | patch
Permalink /patch/54232/
State Accepted
Delegated to: David Miller
Headers show

Comments

stephen hemminger - June 1, 2010, 4:05 p.m.
Sparse complains about shadowed declaration of skb. So use other
name.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - June 2, 2010, 12:17 p.m.
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 1 Jun 2010 09:05:46 -0700

> Sparse complains about shadowed declaration of skb. So use other
> name.
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/drivers/net/ppp_generic.c	2010-06-01 08:49:58.859739636 -0700
+++ b/drivers/net/ppp_generic.c	2010-06-01 08:50:41.184870657 -0700
@@ -1927,9 +1927,9 @@  ppp_receive_mp_frame(struct ppp *ppp, st
 	/* 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. */