can: ems_usb: improve error reporting for error warning and error passive

mlederhi · marckleinebudde · commit 6ebc5e8fe852 · 2018-01-04T16:14:38.000+01:00
This patch adds the missing CAN_ERR_CRTL to cf-&gt;can_id in case of
CAN_STATE_ERROR_WARNING or CAN_STATE_ERROR_PASSIVE

Signed-off-by: Martin Lederhilger &lt;m.lederhilger@ds-automotion.com&gt;
Signed-off-by: Marc Kleine-Budde &lt;mkl@pengutronix.de&gt;
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;
 		}

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`	`}`