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

Commit ffd461f8 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Marc Kleine-Budde
Browse files

can: fix assignment of error location in CAN error messages 

As Dan Carpenter reported in http://marc.info/?l=linux-can&m=144793696016187


the assignment of the error location in CAN error messages had some bit wise
overlaps. Indeed the value to be assigned in data[3] is no bitfield but defines
a single value which points to a location inside the CAN frame on the wire.

This patch fixes the assignments for the error locations in error messages.

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 7cecd9ab

drivers/net/can/c_can/c_can.c

+2 −4
Original line number Diff line number Diff line
@@ -975,8 +975,7 @@ static int c_can_handle_bus_err(struct net_device *dev, 
		break;

	case LEC_ACK_ERROR:

		netdev_dbg(dev, "ack error\n");

		cf->data[3] |= (CAN_ERR_PROT_LOC_ACK |

				CAN_ERR_PROT_LOC_ACK_DEL);

		cf->data[3] = CAN_ERR_PROT_LOC_ACK;

		break;

	case LEC_BIT1_ERROR:

		netdev_dbg(dev, "bit1 error\n");
@@ -988,8 +987,7 @@ static int c_can_handle_bus_err(struct net_device *dev, 
		break;

	case LEC_CRC_ERROR:

		netdev_dbg(dev, "CRC error\n");

		cf->data[3] |= (CAN_ERR_PROT_LOC_CRC_SEQ |

				CAN_ERR_PROT_LOC_CRC_DEL);

		cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;

		break;

	default:

		break;

drivers/net/can/cc770/cc770.c

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ static int cc770_err(struct net_device *dev, u8 status) 
				cf->data[2] |= CAN_ERR_PROT_BIT0;

				break;

			case STAT_LEC_CRC:

				cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;

				cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;

				break;

			}

		}

drivers/net/can/flexcan.c

+2 −2
Original line number Diff line number Diff line
@@ -535,13 +535,13 @@ static void do_bus_err(struct net_device *dev, 
	if (reg_esr & FLEXCAN_ESR_ACK_ERR) {

		netdev_dbg(dev, "ACK_ERR irq\n");

		cf->can_id |= CAN_ERR_ACK;

		cf->data[3] |= CAN_ERR_PROT_LOC_ACK;

		cf->data[3] = CAN_ERR_PROT_LOC_ACK;

		tx_errors = 1;

	}

	if (reg_esr & FLEXCAN_ESR_CRC_ERR) {

		netdev_dbg(dev, "CRC_ERR irq\n");

		cf->data[2] |= CAN_ERR_PROT_BIT;

		cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;

		cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;

		rx_errors = 1;

	}

	if (reg_esr & FLEXCAN_ESR_FRM_ERR) {

drivers/net/can/m_can/m_can.c

+2 −4
Original line number Diff line number Diff line
@@ -500,8 +500,7 @@ static int m_can_handle_lec_err(struct net_device *dev, 
		break;

	case LEC_ACK_ERROR:

		netdev_dbg(dev, "ack error\n");

		cf->data[3] |= (CAN_ERR_PROT_LOC_ACK |

				CAN_ERR_PROT_LOC_ACK_DEL);

		cf->data[3] = CAN_ERR_PROT_LOC_ACK;

		break;

	case LEC_BIT1_ERROR:

		netdev_dbg(dev, "bit1 error\n");
@@ -513,8 +512,7 @@ static int m_can_handle_lec_err(struct net_device *dev, 
		break;

	case LEC_CRC_ERROR:

		netdev_dbg(dev, "CRC error\n");

		cf->data[3] |= (CAN_ERR_PROT_LOC_CRC_SEQ |

				CAN_ERR_PROT_LOC_CRC_DEL);

		cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;

		break;

	default:

		break;

drivers/net/can/pch_can.c

+1 −2
Original line number Diff line number Diff line
@@ -559,8 +559,7 @@ static void pch_can_error(struct net_device *ndev, u32 status) 
		stats->rx_errors++;

		break;

	case PCH_CRC_ERR:

		cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ |

			       CAN_ERR_PROT_LOC_CRC_DEL;

		cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;

		priv->can.can_stats.bus_error++;

		stats->rx_errors++;

		break;