|
@@ -343,7 +343,6 @@ static void fs_enet_tx(struct net_device *dev)
|
|
|
|
|
|
do_wake = do_restart = 0;
|
|
|
while (((sc = CBDR_SC(bdp)) & BD_ENET_TX_READY) == 0) {
|
|
|
-
|
|
|
dirtyidx = bdp - fep->tx_bd_base;
|
|
|
|
|
|
if (fep->tx_free == fep->tx_ring)
|
|
@@ -444,7 +443,6 @@ fs_enet_interrupt(int irq, void *dev_id)
|
|
|
|
|
|
nr = 0;
|
|
|
while ((int_events = (*fep->ops->get_int_events)(dev)) != 0) {
|
|
|
-
|
|
|
nr++;
|
|
|
|
|
|
int_clr_events = int_events;
|
|
@@ -700,45 +698,43 @@ static void fs_timeout(struct net_device *dev)
|
|
|
*-----------------------------------------------------------------------------*/
|
|
|
static void generic_adjust_link(struct net_device *dev)
|
|
|
{
|
|
|
- struct fs_enet_private *fep = netdev_priv(dev);
|
|
|
- struct phy_device *phydev = fep->phydev;
|
|
|
- int new_state = 0;
|
|
|
-
|
|
|
- if (phydev->link) {
|
|
|
-
|
|
|
- /* adjust to duplex mode */
|
|
|
- if (phydev->duplex != fep->oldduplex){
|
|
|
- new_state = 1;
|
|
|
- fep->oldduplex = phydev->duplex;
|
|
|
- }
|
|
|
-
|
|
|
- if (phydev->speed != fep->oldspeed) {
|
|
|
- new_state = 1;
|
|
|
- fep->oldspeed = phydev->speed;
|
|
|
- }
|
|
|
-
|
|
|
- if (!fep->oldlink) {
|
|
|
- new_state = 1;
|
|
|
- fep->oldlink = 1;
|
|
|
- netif_schedule(dev);
|
|
|
- netif_carrier_on(dev);
|
|
|
- netif_start_queue(dev);
|
|
|
- }
|
|
|
-
|
|
|
- if (new_state)
|
|
|
- fep->ops->restart(dev);
|
|
|
-
|
|
|
- } else if (fep->oldlink) {
|
|
|
- new_state = 1;
|
|
|
- fep->oldlink = 0;
|
|
|
- fep->oldspeed = 0;
|
|
|
- fep->oldduplex = -1;
|
|
|
- netif_carrier_off(dev);
|
|
|
- netif_stop_queue(dev);
|
|
|
- }
|
|
|
-
|
|
|
- if (new_state && netif_msg_link(fep))
|
|
|
- phy_print_status(phydev);
|
|
|
+ struct fs_enet_private *fep = netdev_priv(dev);
|
|
|
+ struct phy_device *phydev = fep->phydev;
|
|
|
+ int new_state = 0;
|
|
|
+
|
|
|
+ if (phydev->link) {
|
|
|
+ /* adjust to duplex mode */
|
|
|
+ if (phydev->duplex != fep->oldduplex) {
|
|
|
+ new_state = 1;
|
|
|
+ fep->oldduplex = phydev->duplex;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (phydev->speed != fep->oldspeed) {
|
|
|
+ new_state = 1;
|
|
|
+ fep->oldspeed = phydev->speed;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!fep->oldlink) {
|
|
|
+ new_state = 1;
|
|
|
+ fep->oldlink = 1;
|
|
|
+ netif_schedule(dev);
|
|
|
+ netif_carrier_on(dev);
|
|
|
+ netif_start_queue(dev);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (new_state)
|
|
|
+ fep->ops->restart(dev);
|
|
|
+ } else if (fep->oldlink) {
|
|
|
+ new_state = 1;
|
|
|
+ fep->oldlink = 0;
|
|
|
+ fep->oldspeed = 0;
|
|
|
+ fep->oldduplex = -1;
|
|
|
+ netif_carrier_off(dev);
|
|
|
+ netif_stop_queue(dev);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (new_state && netif_msg_link(fep))
|
|
|
+ phy_print_status(phydev);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -782,7 +778,6 @@ static int fs_init_phy(struct net_device *dev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
static int fs_enet_open(struct net_device *dev)
|
|
|
{
|
|
|
struct fs_enet_private *fep = netdev_priv(dev);
|
|
@@ -971,7 +966,7 @@ static struct net_device *fs_init_instance(struct device *dev,
|
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_FS_ENET_HAS_SCC
|
|
|
- if (fs_get_scc_index(fpi->fs_no) >=0 )
|
|
|
+ if (fs_get_scc_index(fpi->fs_no) >=0)
|
|
|
fep->ops = &fs_scc_ops;
|
|
|
#endif
|
|
|
|
|
@@ -1066,9 +1061,8 @@ static struct net_device *fs_init_instance(struct device *dev,
|
|
|
|
|
|
return ndev;
|
|
|
|
|
|
- err:
|
|
|
+err:
|
|
|
if (ndev != NULL) {
|
|
|
-
|
|
|
if (registered)
|
|
|
unregister_netdev(ndev);
|
|
|
|
|
@@ -1259,7 +1253,6 @@ static int __init fs_init(void)
|
|
|
err:
|
|
|
cleanup_immap();
|
|
|
return r;
|
|
|
-
|
|
|
}
|
|
|
|
|
|
static void __exit fs_cleanup(void)
|