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

Commit 90bb81f3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-4.4-20151123' of... 

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



Marc Kleine-Budde says:

====================
pull-request: can 2015-11-23

this is a pull request of three patches for the upcoming v4.4 release.

The first patch is by Mirza Krak, it fixes a problem with the sja1000 driver
after resuming from suspend to disk, by clearing all outstanding interrupts.
Oliver Hartkopp contributes two patches targeting almost all driver, they fix
the assignment of the error location in CAN error messages.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7098356b a2ec19f8

drivers/net/can/bfin_can.c

+0 −2
Original line number Diff line number Diff line
@@ -501,8 +501,6 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status) 
			cf->data[2] |= CAN_ERR_PROT_FORM;

		else if (status & SER)

			cf->data[2] |= CAN_ERR_PROT_STUFF;

		else

			cf->data[2] |= CAN_ERR_PROT_UNSPEC;

	}



	priv->can.state = state;

drivers/net/can/c_can/c_can.c

+2 −5
Original line number Diff line number Diff line
@@ -962,7 +962,6 @@ static int c_can_handle_bus_err(struct net_device *dev, 
	 * type of the last error to occur on the CAN bus

	 */

	cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;

	cf->data[2] |= CAN_ERR_PROT_UNSPEC;



	switch (lec_type) {

	case LEC_STUFF_ERROR:
@@ -975,8 +974,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 +986,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/janz-ican3.c

+0 −1
Original line number Diff line number Diff line
@@ -1096,7 +1096,6 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg) 
			cf->data[2] |= CAN_ERR_PROT_STUFF;

			break;

		default:

			cf->data[2] |= CAN_ERR_PROT_UNSPEC;

			cf->data[3] = ecc & ECC_SEG;

			break;

		}