11.1/fix-enum-types.diff

Fix enum types mismatch.

diff -ru --exclude-from freebsd-src-diff-exclude-names /usr/src/sys/arm/arm/gic.c freebsd-11.1/sys/arm/arm/gic.c
--- /usr/src/sys/arm/arm/gic.c	2017-07-21 07:42:04.000000000 +0800
+++ freebsd-11.1/sys/arm/arm/gic.c	2020-01-06 21:07:48.995798491 +0800
@@ -1151,7 +1151,7 @@
 		gi->gi_trig = trig;
 
 		/* Edge triggered interrupts need an early EOI sent */
-		if (gi->gi_pol == INTR_TRIGGER_EDGE)
+		if (gi->gi_trig == INTR_TRIGGER_EDGE)
 			gi->gi_flags |= GI_FLAG_EARLY_EOI;
 	}
 
diff -ru --exclude-from freebsd-src-diff-exclude-names /usr/src/sys/dev/isci/scil/scif_sas_smp_remote_device.c freebsd-11.1/usr/src/sys/dev/isci/scil/scif_sas_smp_remote_device.c
--- /usr/src/sys/dev/isci/scil/scif_sas_smp_remote_device.c	2017-07-21 07:41:49.000000000 +0800
+++ freebsd-11.1/usr/src/sys/dev/isci/scil/scif_sas_smp_remote_device.c	2019-03-22 22:34:53.887479000 +0800
@@ -194,7 +194,7 @@
 
    //if Core set the status of this io to be RETRY_REQUIRED, we should
    //retry the IO without even decode the response.
-   if (completion_status == SCI_FAILURE_RETRY_REQUIRED)
+   if (completion_status == SCI_IO_FAILURE_RETRY_REQUIRED)
    {
       scif_sas_smp_remote_device_continue_current_activity(
          fw_device, fw_request, SCI_FAILURE_RETRY_REQUIRED
diff -ru --exclude-from freebsd-src-diff-exclude-names /usr/src/sys/dev/cxgbe/t4_main.c freebsd-11.1/usr/src/sys/dev/cxgbe/t4_main.c
--- /usr/src/sys/dev/cxgbe/t4_main.c	2017-07-21 07:41:45.000000000 +0800
+++ freebsd-11.1/usr/src/sys/dev/cxgbe/t4_main.c	2019-03-22 23:01:45.635347000 +0800
@@ -7904,11 +7904,11 @@
 		goto done;
 	}
 
-	if (tc.ratemode == SCHED_CLASS_RATEMODE_REL) {
+	if (tc.ratemode == FW_SCHED_PARAMS_RATE_REL) {
 		/* XXX: top speed or actual link speed? */
 		gbps = port_top_speed(sc->port[port_id]);
 		sbuf_printf(sb, " %u%% of %uGbps", tc.maxrate, gbps);
-	} else if (tc.ratemode == SCHED_CLASS_RATEMODE_ABS) {
+	} else if (tc.ratemode == FW_SCHED_PARAMS_RATE_ABS) {
 		switch (tc.rateunit) {
 		case SCHED_CLASS_RATEUNIT_BITS:
 			mbps = tc.maxrate / 1000;
diff -ru --exclude-from freebsd-src-diff-exclude-names /usr/src/sys/dev/ena/ena.c freebsd-11.1/usr/src/sys/dev/ena/ena.c
--- /usr/src/sys/dev/ena/ena.c	2017-07-21 07:41:43.000000000 +0800
+++ freebsd-11.1/usr/src/sys/dev/ena/ena.c	2019-03-22 23:09:27.923648000 +0800
@@ -1375,7 +1375,7 @@
 		mbuf->m_pkthdr.flowid = ena_rx_ctx->hash;
 
 		if (ena_rx_ctx->frag &&
-		    ena_rx_ctx->l3_proto != ENA_ETH_IO_L4_PROTO_UNKNOWN) {
+		    ena_rx_ctx->l3_proto != ENA_ETH_IO_L3_PROTO_UNKNOWN) {
 			M_HASHTYPE_SET(mbuf, M_HASHTYPE_OPAQUE_HASH);
 			return;
 		}