Date: Tue, 03 Sep 2019 14:06:10 -0000 From: Marcin Wojtas <mw@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r345872 - stable/12/sys/dev/ena Message-ID: <201904040908.x34989XI069881@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mw Date: Thu Apr 4 09:08:09 2019 New Revision: 345872 URL: https://svnweb.freebsd.org/changeset/base/345872 Log: MFC r345371: Prevent double activation of admin interrupt in ENA Submitted by: Michal Krawczyk <mk@semihalf.com> Obtained from: Semihalf Sponsored by: Amazon, Inc. Modified: stable/12/sys/dev/ena/ena.c stable/12/sys/dev/ena/ena.h Modified: stable/12/sys/dev/ena/ena.c ============================================================================== --- stable/12/sys/dev/ena/ena.c Thu Apr 4 09:06:56 2019 (r345871) +++ stable/12/sys/dev/ena/ena.c Thu Apr 4 09:08:09 2019 (r345872) @@ -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/12/sys/dev/ena/ena.h ============================================================================== --- stable/12/sys/dev/ena/ena.h Thu Apr 4 09:06:56 2019 (r345871) +++ stable/12/sys/dev/ena/ena.h Thu Apr 4 09:08:09 2019 (r345872) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904040908.x34989XI069881>