]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
can: c_can: end pending transmission on network stop (ifdown)
authorViktor Babrian <babrian.viktor@renyi.mta.hu>
Sun, 18 Jan 2015 19:01:40 +0000 (20:01 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 21 Jan 2015 21:43:14 +0000 (22:43 +0100)
Put controller into init mode in network stop to end pending transmissions. The
issue is observed in cases when transmitted frame is not acked.

Signed-off-by: Viktor Babrian <babrian.viktor@renyi.mta.hu>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/c_can/c_can.c

index f94a9fa60488ed8e23523f5f8c3665133f039dbb..c672c4dcffac14349d20d362dd5b199dd9bcd95c 100644 (file)
@@ -615,6 +615,9 @@ static void c_can_stop(struct net_device *dev)
 
        c_can_irq_control(priv, false);
 
+       /* put ctrl to init on stop to end ongoing transmission */
+       priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_INIT);
+
        /* deactivate pins */
        pinctrl_pm_select_sleep_state(dev->dev.parent);
        priv->can.state = CAN_STATE_STOPPED;