diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-23 21:15:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-23 21:15:32 +0200 |
| commit | 7a1a0cbfeb31f20acc10722642198e76bbc30cb9 (patch) | |
| tree | c2ea99d235ebb095b172981dbaf9a696f62df540 /drivers/net | |
| parent | xfrm: properly handle invalid states as an error (diff) | |
| download | linux-7a1a0cbfeb31f20acc10722642198e76bbc30cb9.tar.xz linux-7a1a0cbfeb31f20acc10722642198e76bbc30cb9.zip | |
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) static void bmac_set_multicast(struct net_device *dev) { struct netdev_hw_addr *ha; + int i; unsigned short rx_cfg; u32 crc; 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) unsigned long flags; struct netdev_hw_addr *ha; u32 recognise = ETH_ARC_AB; /* always accept broadcasts */ + int i; /* Set promiscuous mode */ 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) struct bigmac *bp = netdev_priv(dev); void __iomem *bregs = bp->bregs; struct netdev_hw_addr *ha; + int i; u32 tmp, crc; /* Disable the receiver. The bit self-clears when |