Merge tag 'linux-can-fixes-for-4.15-20180104' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

davem330 · davem330 · commit 3e6e867afe9b · 2018-01-05T13:48:00.000-05:00
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 &lt;davem@davemloft.net&gt;
diff --git 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]);
 	}
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
@@ -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;
 		}
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
@@ -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)
diff --git a/drivers/net/can/vxcan.c b/drivers/net/can/vxcan.c
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ static int flexcan_start_xmit(struct sk_buff skb, struct net_device dev)`
`526`	`526`	`data = be32_to_cpup((__be32 *)&cf->data[0]);`
`527`	`527`	`flexcan_write(data, &priv->tx_mb->data[0]);`
`528`	`528`	`}`
`529`		`- if (cf->can_dlc > 3) {`
	`529`	`+ if (cf->can_dlc > 4) {`
`530`	`530`	`data = be32_to_cpup((__be32 *)&cf->data[4]);`
`531`	`531`	`flexcan_write(data, &priv->tx_mb->data[1]);`
`532`	`532`	`}`
Original file line number	Diff line number	Diff line change
`@@ -395,6 +395,7 @@ static void ems_usb_rx_err(struct ems_usb dev, struct ems_cpc_msg msg)`
`395`	`395`
`396`	`396`	`if (dev->can.state == CAN_STATE_ERROR_WARNING \|\|`
`397`	`397`	`dev->can.state == CAN_STATE_ERROR_PASSIVE) {`
	`398`	`+ cf->can_id \|= CAN_ERR_CRTL;`
`398`	`399`	`cf->data[1] = (txerr > rxerr) ?`
`399`	`400`	`CAN_ERR_CRTL_TX_PASSIVE : CAN_ERR_CRTL_RX_PASSIVE;`
`400`	`401`	`}`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ static int gs_usb_set_bittiming(struct net_device *netdev)`
`449`	`449`	`dev_err(netdev->dev.parent, "Couldn't set bittimings (err=%d)",`
`450`	`450`	`rc);`
`451`	`451`
`452`		`- return rc;`
	`452`	`+ return (rc > 0) ? 0 : rc;`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`static void gs_usb_xmit_callback(struct urb *urb)`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ static int vxcan_newlink(struct net net, struct net_device dev,`
`194`	`194`	`tbp = peer_tb;`
`195`	`195`	`}`
`196`	`196`
`197`		`- if (tbp[IFLA_IFNAME]) {`
	`197`	`+ if (ifmp && tbp[IFLA_IFNAME]) {`
`198`	`198`	`nla_strlcpy(ifname, tbp[IFLA_IFNAME], IFNAMSIZ);`
`199`	`199`	`name_assign_type = NET_NAME_USER;`
`200`	`200`	`} else {`