ipwireless: Remove unused defines

[safe/jmp/linux-2.6] / drivers / net / sh_eth.c

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index f64d987..c69ba13 100644 (file)
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -322,7 +322,7 @@ static int sh_eth_dev_init(struct net_device *ndev)
        ctrl_outl((FIFO_SIZE_T | FIFO_SIZE_R), ioaddr + FDR);
        ctrl_outl(0, ioaddr + TFTR);
 
-       ctrl_outl(RMCR_RST, ioaddr + RMCR);
+       ctrl_outl(0, ioaddr + RMCR);
 
        rx_int_var = mdp->rx_int_var = DESC_I_RINT8 | DESC_I_RINT5;
        tx_int_var = mdp->tx_int_var = DESC_I_TINT2;
@@ -642,17 +642,12 @@ static void sh_eth_adjust_link(struct net_device *ndev)
                                        | ECMR_DM, ioaddr + ECMR);
                        new_state = 1;
                        mdp->link = phydev->link;
-                       netif_schedule(ndev);
-                       netif_carrier_on(ndev);
-                       netif_start_queue(ndev);
                }
        } else if (mdp->link) {
                new_state = 1;
                mdp->link = PHY_DOWN;
                mdp->speed = 0;
                mdp->duplex = -1;
-               netif_stop_queue(ndev);
-               netif_carrier_off(ndev);
        }
 
        if (new_state)
@@ -994,7 +989,7 @@ static int sh_mdio_init(struct net_device *ndev, int id)
        /* Hook up MII support for ethtool */
        mdp->mii_bus->name = "sh_mii";
        mdp->mii_bus->dev = &ndev->dev;
-       mdp->mii_bus->id = id;
+       mdp->mii_bus->id[0] = id;
 
        /* PHY IRQ */
        mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);