diff options
author | David S. Miller <davem@davemloft.net> | 2013-05-23 15:15:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-05-23 15:15:32 -0400 |
commit | 7a1a0cbfeb31f20acc10722642198e76bbc30cb9 (patch) | |
tree | c2ea99d235ebb095b172981dbaf9a696f62df540 /drivers/net | |
parent | 497574c72c9922cf20c12aed15313c389f722fa0 (diff) |
net: Revert unused variable changes.
This reverts commits:
c573972c111eb4c6b3f3250ad71e7c75cc799833
1a5904342c7380ceddd61c0b37544d752d0b1433
da2e2c214953f37c2a6be20226537ca5a329724c
They were meant for net-next not net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/apple/bmac.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/korina.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/sun/sunbmac.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c index 8848190e403d..f36bbd6d5085 100644 --- a/drivers/net/ethernet/apple/bmac.c +++ b/drivers/net/ethernet/apple/bmac.c | |||
@@ -1016,6 +1016,7 @@ static void bmac_set_multicast(struct net_device *dev) | |||
1016 | static void bmac_set_multicast(struct net_device *dev) | 1016 | static void bmac_set_multicast(struct net_device *dev) |
1017 | { | 1017 | { |
1018 | struct netdev_hw_addr *ha; | 1018 | struct netdev_hw_addr *ha; |
1019 | int i; | ||
1019 | unsigned short rx_cfg; | 1020 | unsigned short rx_cfg; |
1020 | u32 crc; | 1021 | u32 crc; |
1021 | 1022 | ||
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c index 907e94a3fb06..5409fe876a44 100644 --- a/drivers/net/ethernet/korina.c +++ b/drivers/net/ethernet/korina.c | |||
@@ -483,6 +483,7 @@ static void korina_multicast_list(struct net_device *dev) | |||
483 | unsigned long flags; | 483 | unsigned long flags; |
484 | struct netdev_hw_addr *ha; | 484 | struct netdev_hw_addr *ha; |
485 | u32 recognise = ETH_ARC_AB; /* always accept broadcasts */ | 485 | u32 recognise = ETH_ARC_AB; /* always accept broadcasts */ |
486 | int i; | ||
486 | 487 | ||
487 | /* Set promiscuous mode */ | 488 | /* Set promiscuous mode */ |
488 | if (dev->flags & IFF_PROMISC) | 489 | if (dev->flags & IFF_PROMISC) |
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c index 85d3b6bec160..054975939a18 100644 --- a/drivers/net/ethernet/sun/sunbmac.c +++ b/drivers/net/ethernet/sun/sunbmac.c | |||
@@ -995,6 +995,7 @@ static void bigmac_set_multicast(struct net_device *dev) | |||
995 | struct bigmac *bp = netdev_priv(dev); | 995 | struct bigmac *bp = netdev_priv(dev); |
996 | void __iomem *bregs = bp->bregs; | 996 | void __iomem *bregs = bp->bregs; |
997 | struct netdev_hw_addr *ha; | 997 | struct netdev_hw_addr *ha; |
998 | int i; | ||
998 | u32 tmp, crc; | 999 | u32 tmp, crc; |
999 | 1000 | ||
1000 | /* Disable the receiver. The bit self-clears when | 1001 | /* Disable the receiver. The bit self-clears when |