10.4/fix-sequence-point-violation.diff

Fix undefined result for violating sequence point rule.

diff -ru --exclude-from freebsd-src-diff-exclude-names /var/archive3/public/freebsd-releng-10.4-src/sys/dev/qlxgb/qla_os.c freebsd-10.4/sys/dev/qlxgb/qla_os.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/qlxgb/qla_os.c	2017-09-29 08:19:54.000000000 +0800
+++ freebsd-10.4/sys/dev/qlxgb/qla_os.c	2019-08-17 23:32:47.516345651 +0800
@@ -224,7 +224,8 @@
 			taskqueue_enqueue(ha->tx_tq, &ha->tx_task);
 		}
 	}
-	ha->watchdog_ticks = ha->watchdog_ticks++ % 1000;
+	ha->watchdog_ticks %= 1000;
+	ha->watchdog_ticks++;
 	callout_reset(&ha->tx_callout, QLA_WATCHDOG_CALLOUT_TICKS,
 		qla_watchdog, ha);
 }
Only in freebsd-10.4/sys/dev/qlxgbe: ql_os.c.rej
diff -ru --exclude-from freebsd-src-diff-exclude-names /var/archive3/public/freebsd-releng-10.4-src/sys/dev/qlxge/qls_os.c freebsd-10.4/sys/dev/qlxge/qls_os.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/qlxge/qls_os.c	2017-09-29 08:19:54.000000000 +0800
+++ freebsd-10.4/sys/dev/qlxge/qls_os.c	2019-08-17 23:32:47.519347500 +0800
@@ -319,7 +319,8 @@
 		ha->qla_watchdog_paused = 1;
 	}
 
-	ha->watchdog_ticks = ha->watchdog_ticks++ % 1000;
+	ha->watchdog_ticks %= 1000;
+	ha->watchdog_ticks++;
 	callout_reset(&ha->tx_callout, QLA_WATCHDOG_CALLOUT_TICKS,
 		qls_watchdog, ha);