diff options
author | Hannes Eder <hannes@hanneseder.net> | 2009-02-18 22:36:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-18 22:36:04 -0500 |
commit | 9107584ecdda31981557034cccf5185afced3e0e (patch) | |
tree | 5e9af0feecc8a4f45ef503dcc0785aff4d38e0f0 /drivers/net/igb | |
parent | ca1ada8861f22db37530594615b635d3dd1bde82 (diff) |
drivers/net/igb: fix sparse warning: symbol shadows an earlier one
Impact: Move variable declaration as far inner as possible.
Fix this sparse warning:
drivers/net/igb/igb_main.c:1895:21: warning: symbol 'j' shadows an earlier one
drivers/net/igb/igb_main.c:1855:16: originally declared here
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 457f12e345ca..87eed88d9586 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -1971,7 +1971,7 @@ static void igb_configure_rx(struct igb_adapter *adapter) | |||
1971 | struct e1000_hw *hw = &adapter->hw; | 1971 | struct e1000_hw *hw = &adapter->hw; |
1972 | u32 rctl, rxcsum; | 1972 | u32 rctl, rxcsum; |
1973 | u32 rxdctl; | 1973 | u32 rxdctl; |
1974 | int i, j; | 1974 | int i; |
1975 | 1975 | ||
1976 | /* disable receives while setting up the descriptors */ | 1976 | /* disable receives while setting up the descriptors */ |
1977 | rctl = rd32(E1000_RCTL); | 1977 | rctl = rd32(E1000_RCTL); |
@@ -1986,7 +1986,7 @@ static void igb_configure_rx(struct igb_adapter *adapter) | |||
1986 | * the Base and Length of the Rx Descriptor Ring */ | 1986 | * the Base and Length of the Rx Descriptor Ring */ |
1987 | for (i = 0; i < adapter->num_rx_queues; i++) { | 1987 | for (i = 0; i < adapter->num_rx_queues; i++) { |
1988 | struct igb_ring *ring = &adapter->rx_ring[i]; | 1988 | struct igb_ring *ring = &adapter->rx_ring[i]; |
1989 | j = ring->reg_idx; | 1989 | int j = ring->reg_idx; |
1990 | rdba = ring->dma; | 1990 | rdba = ring->dma; |
1991 | wr32(E1000_RDBAL(j), | 1991 | wr32(E1000_RDBAL(j), |
1992 | rdba & 0x00000000ffffffffULL); | 1992 | rdba & 0x00000000ffffffffULL); |