Author: mw
Date: Thu Apr  4 09:06:56 2019
New Revision: 345871
URL: https://svnweb.freebsd.org/changeset/base/345871

Log:
  MFC r345371: Prevent double activation of admin interrupt in ENA
  
  Submitted by: Michal Krawczyk <m...@semihalf.com>
  Obtained from: Semihalf
  Sponsored by: Amazon, Inc.

Modified:
  stable/11/sys/dev/ena/ena.c
  stable/11/sys/dev/ena/ena.h

Modified: stable/11/sys/dev/ena/ena.c
==============================================================================
--- stable/11/sys/dev/ena/ena.c Thu Apr  4 04:14:20 2019        (r345870)
+++ stable/11/sys/dev/ena/ena.c Thu Apr  4 09:06:56 2019        (r345871)
@@ -1944,14 +1944,6 @@ ena_request_mgmnt_irq(struct ena_adapter *adapter)
                return (ENXIO);
        }
 
-       rc = bus_activate_resource(adapter->pdev, SYS_RES_IRQ,
-           irq->vector, irq->res);
-       if (unlikely(rc != 0)) {
-               device_printf(adapter->pdev, "could not activate "
-                   "irq vector: %d\n", irq->vector);
-               goto err_res_free;
-       }
-
        rc = bus_setup_intr(adapter->pdev, irq->res,
            INTR_TYPE_NET | INTR_MPSAFE, NULL, ena_intr_msix_mgmnt,
            irq->data, &irq->cookie);

Modified: stable/11/sys/dev/ena/ena.h
==============================================================================
--- stable/11/sys/dev/ena/ena.h Thu Apr  4 04:14:20 2019        (r345870)
+++ stable/11/sys/dev/ena/ena.h Thu Apr  4 09:06:56 2019        (r345871)
@@ -41,7 +41,7 @@
 
 #define DRV_MODULE_VER_MAJOR   0
 #define DRV_MODULE_VER_MINOR   8
-#define DRV_MODULE_VER_SUBMINOR 3
+#define DRV_MODULE_VER_SUBMINOR 4
 
 #define DRV_MODULE_NAME                "ena"
 


_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to