Commit 4f2d56c4 authored Mar 21, 2011 by Jan Altenberg Committed by David S. Miller Mar 21, 2011

can: c_can: Do basic c_can configuration _before_ enabling the interrupts



I ran into some trouble while testing the SocketCAN driver for the BOSCH
C_CAN controller. The interface is not correctly initialized, if I put
some CAN traffic on the line, _while_ the interface is being started
(which means: the interface doesn't come up correcty, if there's some RX
traffic while doing 'ifconfig can0 up').

The current implementation enables the controller interrupts _before_
doing the basic c_can configuration. I think, this should be done the
other way round.

The patch below fixes things for me.

Signed-off-by: Jan Altenberg <jan@linutronix.de>
Acked-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b20e7bbf

drivers/net/can/c_can/c_can.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -633,9 +633,6 @@ static void c_can_start(struct net_device *dev)
		{
		struct c_can_priv *priv = netdev_priv(dev);

		/* enable status change, error and module interrupts */
		c_can_enable_all_interrupts(priv, ENABLE_ALL_INTERRUPTS);

		/* basic c_can configuration */
		c_can_chip_config(dev);

		@@ -643,6 +640,9 @@ static void c_can_start(struct net_device *dev)

		/* reset tx helper pointers */
		priv->tx_next = priv->tx_echo = 0;

		/* enable status change, error and module interrupts */
		c_can_enable_all_interrupts(priv, ENABLE_ALL_INTERRUPTS);
		}

		static void c_can_stop(struct net_device *dev)