Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 7a1a0cbfeb31f20acc10722642198e76bbc30cb9

Authored by David S. Miller
1 parent 497574c72c
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 3 changed files with 3 additions and 0 deletions Side-by-side Diff

drivers/net/ethernet/apple/bmac.c
Diff comments   View file @ 7a1a0cb
... ... @@ -1016,6 +1016,7 @@
1016 1016 static void bmac_set_multicast(struct net_device *dev)
1017 1017 {
1018 1018 struct netdev_hw_addr *ha;
  1019 + int i;
1019 1020 unsigned short rx_cfg;
1020 1021 u32 crc;
1021 1022  
drivers/net/ethernet/korina.c
Diff comments   View file @ 7a1a0cb
... ... @@ -483,6 +483,7 @@
483 483 unsigned long flags;
484 484 struct netdev_hw_addr *ha;
485 485 u32 recognise = ETH_ARC_AB; /* always accept broadcasts */
  486 + int i;
486 487  
487 488 /* Set promiscuous mode */
488 489 if (dev->flags & IFF_PROMISC)
drivers/net/ethernet/sun/sunbmac.c
Diff comments   View file @ 7a1a0cb
... ... @@ -995,6 +995,7 @@
995 995 struct bigmac *bp = netdev_priv(dev);
996 996 void __iomem *bregs = bp->bregs;
997 997 struct netdev_hw_addr *ha;
  998 + int i;
998 999 u32 tmp, crc;
999 1000  
1000 1001 /* Disable the receiver. The bit self-clears when