blob: 57ad0c2dcf5c55a8abc33dad4d6cce966d65d2d0 [file] [log] [blame] [raw]
Fix undefined result for violating sequence point rule.
diff -ru --exclude-from freebsd-src-diff-exclude-names /var/tmp/freebsd-10.3-src/usr/src/sys/dev/qlxgb/qla_os.c freebsd-10.3/usr/src/sys/dev/qlxgb/qla_os.c
--- /var/tmp/freebsd-10.3-src/usr/src/sys/dev/qlxgb/qla_os.c 2016-03-25 09:09:38.000000000 +0800
+++ freebsd-10.3/usr/src/sys/dev/qlxgb/qla_os.c 2019-03-23 15:23:10.099537886 +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);
}
diff -ru --exclude-from freebsd-src-diff-exclude-names /var/tmp/freebsd-10.3-src/usr/src/sys/dev/qlxgbe/ql_os.c freebsd-10.3/usr/src/sys/dev/qlxgbe/ql_os.c
--- /var/tmp/freebsd-10.3-src/usr/src/sys/dev/qlxgbe/ql_os.c 2016-03-25 09:09:31.000000000 +0800
+++ freebsd-10.3/usr/src/sys/dev/qlxgbe/ql_os.c 2019-03-23 15:24:05.785540467 +0800
@@ -272,7 +272,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,
qla_watchdog, ha);
}
diff -ru --exclude-from freebsd-src-diff-exclude-names /var/tmp/freebsd-10.3-src/usr/src/sys/dev/qlxge/qls_os.c freebsd-10.3/usr/src/sys/dev/qlxge/qls_os.c
--- /var/tmp/freebsd-10.3-src/usr/src/sys/dev/qlxge/qls_os.c 2016-03-25 09:09:36.000000000 +0800
+++ freebsd-10.3/usr/src/sys/dev/qlxge/qls_os.c 2019-03-23 15:18:33.349579537 +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);