X-Git-Url: http://rtime.felk.cvut.cz/gitweb/socketcan-devel.git/blobdiff_plain/5c26be48da98190f6d359afffc820a60c570babf..068120ecf01adb48454d54e029bcea7b3a83e25e:/kernel/2.6/drivers/net/can/dev.c?ds=sidebyside

diff --git a/kernel/2.6/drivers/net/can/dev.c b/kernel/2.6/drivers/net/can/dev.c
index 0b68c16..59e779b 100644
--- a/kernel/2.6/drivers/net/can/dev.c
+++ b/kernel/2.6/drivers/net/can/dev.c
@@ -160,7 +160,19 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
 	bt->prop_seg = tseg1 / 2;
 	bt->phase_seg1 = tseg1 - bt->prop_seg;
 	bt->phase_seg2 = tseg2;
-	bt->sjw = 1;
+
+	/* check for sjw user settings */
+	if (!bt->sjw || !btc->sjw_max)
+		bt->sjw = 1;
+	else {
+		/* bt->sjw is at least 1 -> sanitize upper bound to sjw_max */
+		if (bt->sjw > btc->sjw_max)
+			bt->sjw = btc->sjw_max;
+		/* bt->sjw must not be higher than tseg2 */
+		if (tseg2 < bt->sjw)
+			bt->sjw = tseg2;
+	}
+
 	bt->brp = best_brp;
 #ifndef CONFIG_CAN_DEV_SYSFS
 	/* real bit-rate */