From: Giuseppe CAVALLARO Date: Tue, 27 Jul 2010 00:09:46 +0000 (+0000) Subject: stmmac: fix timer setup when use dual mac Kconfig X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ca09c9760101b607cd2282c45b342655e26fa683;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index 0bdd3326c94..1083334ccd2 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;