* pull-request: can 2015-01-21
@ 2015-01-21 21:46 Marc Kleine-Budde
2015-01-21 21:46 ` [PATCH] can: c_can: end pending transmission on network stop (ifdown) Marc Kleine-Budde
2015-01-26 23:24 ` pull-request: can 2015-01-21 David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2015-01-21 21:46 UTC (permalink / raw)
To: netdev; +Cc: davem, linux-can, kernel
Hello David,
this is a pull request for v3.19, net/master, which consists of a single patch.
Viktor Babrian fixes the issue in the c_can dirver, that the CAN interface
might continue to send frames after the interface has been shut down.
regards,
Marc
---
The following changes since commit 06efe0e54018cb19cf0807447dc3ac747ffcfd1c:
Merge tag 'pinctrl-v3.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl (2015-01-20 21:23:41 +1200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-3.19-20150121
for you to fetch changes up to 7ffd7b4e169d619e66928fe5d997723f2c6f1056:
can: c_can: end pending transmission on network stop (ifdown) (2015-01-21 22:43:14 +0100)
----------------------------------------------------------------
linux-can-fixes-for-3.19-20150121
----------------------------------------------------------------
Viktor Babrian (1):
can: c_can: end pending transmission on network stop (ifdown)
drivers/net/can/c_can/c_can.c | 3 +++
1 file changed, 3 insertions(+)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] can: c_can: end pending transmission on network stop (ifdown)
2015-01-21 21:46 pull-request: can 2015-01-21 Marc Kleine-Budde
@ 2015-01-21 21:46 ` Marc Kleine-Budde
2015-01-26 23:24 ` pull-request: can 2015-01-21 David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2015-01-21 21:46 UTC (permalink / raw)
To: netdev
Cc: davem, linux-can, kernel, Viktor Babrian, linux-stable,
Marc Kleine-Budde
From: Viktor Babrian <babrian.viktor@renyi.mta.hu>
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 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index f94a9fa60488..c672c4dcffac 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -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;
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: pull-request: can 2015-01-21
2015-01-21 21:46 pull-request: can 2015-01-21 Marc Kleine-Budde
2015-01-21 21:46 ` [PATCH] can: c_can: end pending transmission on network stop (ifdown) Marc Kleine-Budde
@ 2015-01-26 23:24 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-01-26 23:24 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 21 Jan 2015 22:46:30 +0100
> this is a pull request for v3.19, net/master, which consists of a single patch.
>
> Viktor Babrian fixes the issue in the c_can dirver, that the CAN interface
> might continue to send frames after the interface has been shut down.
Pulled, thanks Marc.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-27 0:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-21 21:46 pull-request: can 2015-01-21 Marc Kleine-Budde
2015-01-21 21:46 ` [PATCH] can: c_can: end pending transmission on network stop (ifdown) Marc Kleine-Budde
2015-01-26 23:24 ` pull-request: can 2015-01-21 David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.