Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e6e867a authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-4.15-20180104' of... 

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: default avatarDavid S. Miller <davem@davemloft.net>
parents d1616f07 6ebc5e8f

drivers/net/can/flexcan.c

+1 −1
Original line number Diff line number Diff line
@@ -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]);

	}

drivers/net/can/usb/ems_usb.c

+1 −0
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg) 


		if (dev->can.state == CAN_STATE_ERROR_WARNING ||

		    dev->can.state == CAN_STATE_ERROR_PASSIVE) {

			cf->can_id |= CAN_ERR_CRTL;

			cf->data[1] = (txerr > rxerr) ?

			    CAN_ERR_CRTL_TX_PASSIVE : CAN_ERR_CRTL_RX_PASSIVE;

		}

drivers/net/can/usb/gs_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static int gs_usb_set_bittiming(struct net_device *netdev) 
		dev_err(netdev->dev.parent, "Couldn't set bittimings (err=%d)",

			rc);



	return rc;

	return (rc > 0) ? 0 : rc;

}



static void gs_usb_xmit_callback(struct urb *urb)

drivers/net/can/vxcan.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, 
		tbp = peer_tb;

	}



	if (tbp[IFLA_IFNAME]) {

	if (ifmp && tbp[IFLA_IFNAME]) {

		nla_strlcpy(ifname, tbp[IFLA_IFNAME], IFNAMSIZ);

		name_assign_type = NET_NAME_USER;

	} else {