summaryrefslogtreecommitdiffstats
path: root/drivers/net/stmmac
diff options
context:
space:
mode:
authorGiuseppe CAVALLARO <peppe.cavallaro@st.com>2010-07-27 00:09:46 +0000
committerDavid S. Miller <davem@davemloft.net>2010-07-27 20:43:50 -0700
commitca09c9760101b607cd2282c45b342655e26fa683 (patch)
treedff6ecf3387ab18a62176622ad1c0c0c2d1ec672 /drivers/net/stmmac
parent49efec1eaf12d03213f1421094afb4cece109062 (diff)
downloadblackbird-op-linux-ca09c9760101b607cd2282c45b342655e26fa683.tar.gz
blackbird-op-linux-ca09c9760101b607cd2282c45b342655e26fa683.zip
stmmac: fix timer setup when use dual mac Kconfig
The driver erroneously sets the tmrate to zero when the TMU initialisation fails. This actually generates problems while using the dual GMAC configuration. With this patch, enabling both the dual gmac and the timer optimisation, the first interface opened will use the tmu channel 2, the second one won't be able to use the timer but will continue to work without mitigating the interrupts by using the external timer (i.e. TMU channel 2). Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/stmmac')
-rw-r--r--drivers/net/stmmac/stmmac_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index 0bdd3326c94a..1083334ccd21 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -829,7 +829,6 @@ static int stmmac_open(struct net_device *dev)
* In case of failure continue without timer. */
if (unlikely((stmmac_open_ext_timer(dev, priv->tm)) < 0)) {
pr_warning("stmmaceth: cannot attach the external timer.\n");
- tmrate = 0;
priv->tm->freq = 0;
priv->tm->timer_start = stmmac_no_timer_started;
priv->tm->timer_stop = stmmac_no_timer_stopped;
OpenPOWER on IntegriCloud