| From 7ffd7b4e169d619e66928fe5d997723f2c6f1056 Mon Sep 17 00:00:00 2001 |
| From: Viktor Babrian <babrian.viktor@renyi.mta.hu> |
| Date: Sun, 18 Jan 2015 20:01:40 +0100 |
| Subject: can: c_can: end pending transmission on network stop (ifdown) |
| |
| From: Viktor Babrian <babrian.viktor@renyi.mta.hu> |
| |
| commit 7ffd7b4e169d619e66928fe5d997723f2c6f1056 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/can/c_can/c_can.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/drivers/net/can/c_can/c_can.c |
| +++ b/drivers/net/can/c_can/c_can.c |
| @@ -611,6 +611,10 @@ static void c_can_stop(struct net_device |
| struct c_can_priv *priv = netdev_priv(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); |
| + |
| priv->can.state = CAN_STATE_STOPPED; |
| } |
| |