summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300
diff options
context:
space:
mode:
authorYacine Belkadi2012-10-24 16:07:42 +0200
committerYacine Belkadi2012-11-06 09:49:30 +0100
commit3de7bdb827bd2a310f20f66836fe32418efee3d7 (patch)
tree0a6f278b03da90885c2593dee4cd980e5b96a5f5 /cleopatre/linux-2.6.25.10-spc300
parent63f78d2eafe1ffba42e8e66dfebac22c0adaa9d5 (diff)
cleo/linux/drv/eth: don't netif_carrier_{on|off}() on link change, closes #3254
In the Synop3504 Ethernet driver, it is not necessary to call netif_carrier_{on,off}() on link up/down, because the PHY layer already takes care of that before calling the driver's link change handler. More precisely, in linux/drivers/net/phy.c, phy_state_machine() calls netif_carrier_{on|off}() before calling phydev->adjust_link().
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c b/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
index 3806c7a047..e831658cf6 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
@@ -1266,22 +1266,11 @@ static void synop3504_on_link_up(struct net_device *dev)
SynopsysEnableInt(synop);
//restart transmit
- netif_carrier_on(dev);
netif_wake_queue(dev);
}// synop3504_on_link_up
/**
- * Link down config.
- * \param dev device structure.
- */
-static void synop3504_on_link_down(struct net_device *dev)
-{
- //stop transmitted packets
- netif_carrier_off(dev);
-}// synop3504_on_link_down
-
-/**
* Link change callback.
* \param dev device structure.
*/
@@ -1328,8 +1317,6 @@ static void synop3504_handle_link_change(struct net_device *dev)
}
else
{
- //link down
- synop3504_on_link_down(dev);
//Force PHY communication mode to GMII if allowed
SynopsysSetMiiClkCap(synop, 1000);
priv->speed = 0;