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

Commit 12d0d0d3 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by David S. Miller
Browse files

can bcm: fix incomplete tx_setup fix 



The commit aabdcb0b ("can bcm: fix tx_setup
off-by-one errors") fixed only a part of the original problem reported by
Andre Naujoks. It turned out that the original code needed to be re-ordered
to reduce complexity and to finally fix the reported frame counting issues.

Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85a64889

net/can/bcm.c

+21 −27
Original line number Diff line number Diff line
@@ -344,6 +344,18 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head, 
	}

}



static void bcm_tx_start_timer(struct bcm_op *op)

{

	if (op->kt_ival1.tv64 && op->count)

		hrtimer_start(&op->timer,

			      ktime_add(ktime_get(), op->kt_ival1),

			      HRTIMER_MODE_ABS);

	else if (op->kt_ival2.tv64)

		hrtimer_start(&op->timer,

			      ktime_add(ktime_get(), op->kt_ival2),

			      HRTIMER_MODE_ABS);

}



static void bcm_tx_timeout_tsklet(unsigned long data)

{

	struct bcm_op *op = (struct bcm_op *)data;
@@ -365,23 +377,12 @@ static void bcm_tx_timeout_tsklet(unsigned long data) 


			bcm_send_to_user(op, &msg_head, NULL, 0);

		}



		/* send (next) frame */

		bcm_can_tx(op);

		hrtimer_start(&op->timer,

			      ktime_add(ktime_get(), op->kt_ival1),

			      HRTIMER_MODE_ABS);



	} else {

		if (op->kt_ival2.tv64) {



			/* send (next) frame */

	} else if (op->kt_ival2.tv64)

		bcm_can_tx(op);

			hrtimer_start(&op->timer,

				      ktime_add(ktime_get(), op->kt_ival2),

				      HRTIMER_MODE_ABS);

		}

	}



	bcm_tx_start_timer(op);

}



/*
@@ -961,28 +962,21 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, 
			hrtimer_cancel(&op->timer);

	}



	if ((op->flags & STARTTIMER) &&

	    ((op->kt_ival1.tv64 && op->count) || op->kt_ival2.tv64)) {



	if (op->flags & STARTTIMER) {

		hrtimer_cancel(&op->timer);

		/* spec: send can_frame when starting timer */

		op->flags |= TX_ANNOUNCE;



		/* only start timer when having more frames than sent below */

		if (op->kt_ival1.tv64 && (op->count > 1)) {

			/* op->count-- is done in bcm_tx_timeout_tsklet */

			hrtimer_start(&op->timer, op->kt_ival1,

				      HRTIMER_MODE_REL);

		} else

			hrtimer_start(&op->timer, op->kt_ival2,

				      HRTIMER_MODE_REL);

	}



	if (op->flags & TX_ANNOUNCE) {

		bcm_can_tx(op);

		if (op->kt_ival1.tv64 && (op->count > 0))

		if (op->count)

			op->count--;

	}



	if (op->flags & STARTTIMER)

		bcm_tx_start_timer(op);



	return msg_head->nframes * CFSIZ + MHSIZ;

}