aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannes Eder <hannes@hanneseder.net>2009-02-14 06:11:55 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-17 20:21:07 -0500
commit1256f7394cc08c60d4502a2f08d7260f3fd97d56 (patch)
treee192a84789333802f9237638d598838d87e0ec04
parent1c10c49d83e2062b309cc88e8eb3abb05d397480 (diff)
drivers/net/at1700.c: fix sparse warning: symbol shadows an earlier one
Impact: Move variable declaration to a more inner scope. Fix this sparse warning: drivers/net/at1700.c:846:21: warning: symbol 'i' shadows an earlier one drivers/net/at1700.c:831:13: originally declared here Signed-off-by: Hannes Eder <hannes@hanneseder.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/at1700.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 72ea6e378f8d..ced70799b898 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -828,7 +828,6 @@ set_rx_mode(struct net_device *dev)
828 struct net_local *lp = netdev_priv(dev); 828 struct net_local *lp = netdev_priv(dev);
829 unsigned char mc_filter[8]; /* Multicast hash filter */ 829 unsigned char mc_filter[8]; /* Multicast hash filter */
830 unsigned long flags; 830 unsigned long flags;
831 int i;
832 831
833 if (dev->flags & IFF_PROMISC) { 832 if (dev->flags & IFF_PROMISC) {
834 memset(mc_filter, 0xff, sizeof(mc_filter)); 833 memset(mc_filter, 0xff, sizeof(mc_filter));
@@ -857,6 +856,7 @@ set_rx_mode(struct net_device *dev)
857 856
858 spin_lock_irqsave (&lp->lock, flags); 857 spin_lock_irqsave (&lp->lock, flags);
859 if (memcmp(mc_filter, lp->mc_filter, sizeof(mc_filter))) { 858 if (memcmp(mc_filter, lp->mc_filter, sizeof(mc_filter))) {
859 int i;
860 int saved_bank = inw(ioaddr + CONFIG_0); 860 int saved_bank = inw(ioaddr + CONFIG_0);
861 /* Switch to bank 1 and set the multicast table. */ 861 /* Switch to bank 1 and set the multicast table. */
862 outw((saved_bank & ~0x0C00) | 0x0480, ioaddr + CONFIG_0); 862 outw((saved_bank & ~0x0C00) | 0x0480, ioaddr + CONFIG_0);