diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-05 21:48:00 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-05 21:48:00 +0300 |
| commit | 3e6e867afe9be617c340dacb194c95fa2fa3d6cc (patch) | |
| tree | d6503d6aaddb11b7796452138d56e18c52dc3018 /drivers/net/can/flexcan.c | |
| parent | d1616f07e8f1a4a490d1791316d4a68906b284aa (diff) | |
| parent | 6ebc5e8fe85286c7392f1777a3dba9e1fd6d0253 (diff) | |
| download | linux-3e6e867afe9be617c340dacb194c95fa2fa3d6cc.tar.xz | |
Merge tag 'linux-can-fixes-for-4.15-20180104' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2018-01-04
this is a pull request for net/master consisting of 4 patches.
The first patch is by Oliver Hartkopp, it improves the error checking
during the creation of a vxcan link. Wolfgang Grandegger's patch for the
gs_usb driver fixes the return value of the "set_bittiming" callback.
Luu An Phu provides a patch for the flexcan driver to fix the frame
length check in the flexcan_start_xmit() function. The last patch is by
Martin Lederhilger for the ems_usb driver and improves the error
reporting for error warning and passive frames.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/flexcan.c')
| -rw-r--r-- | drivers/net/can/flexcan.c | 2 |
1 files changed, 1 insertions, 1 deletions
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]); } |