From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linux-can@vger.kernel.org,
kernel@pengutronix.de, Luu An Phu <phu.luuan@nxp.com>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 3/4] can: flex_can: Correct the checking for frame length in flexcan_start_xmit()
Date: Thu, 4 Jan 2018 16:33:54 +0100 [thread overview]
Message-ID: <20180104153355.11243-4-mkl@pengutronix.de> (raw)
In-Reply-To: <20180104153355.11243-1-mkl@pengutronix.de>
From: Luu An Phu <phu.luuan@nxp.com>
The flexcan_start_xmit() function compares the frame length with data
register length to write frame content into data[0] and data[1]
register. Data register length is 4 bytes and frame maximum length is 8
bytes.
Fix the check that compares frame length with 3. Because the register
length is 4.
Signed-off-by: Luu An Phu <phu.luuan@nxp.com>
Reviewed-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/flexcan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 0626dcfd1f3d..760d2c07e3a2 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -526,7 +526,7 @@ static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
data = be32_to_cpup((__be32 *)&cf->data[0]);
flexcan_write(data, &priv->tx_mb->data[0]);
}
- if (cf->can_dlc > 3) {
+ if (cf->can_dlc > 4) {
data = be32_to_cpup((__be32 *)&cf->data[4]);
flexcan_write(data, &priv->tx_mb->data[1]);
}
--
2.15.1
next prev parent reply other threads:[~2018-01-04 15:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-04 15:33 pull-request: can 2018-01-04 Marc Kleine-Budde
2018-01-04 15:33 ` [PATCH 1/4] can: vxcan: improve handling of missing peer name attribute Marc Kleine-Budde
2018-01-04 15:33 ` [PATCH 2/4] can: gs_usb: fix return value of the "set_bittiming" callback Marc Kleine-Budde
2018-01-04 15:33 ` Marc Kleine-Budde [this message]
2018-01-04 15:33 ` [PATCH 4/4] can: ems_usb: improve error reporting for error warning and error passive Marc Kleine-Budde
2018-01-05 18:48 ` pull-request: can 2018-01-04 David Miller
2018-01-07 12:32 ` Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180104153355.11243-4-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=phu.luuan@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox