svn commit: r309459 - in stable: 10/sys/dev/cxgbe 11/sys/dev/cxgbe
John Baldwin
jhb at FreeBSD.org
Sat Dec 3 01:10:47 UTC 2016
Author: jhb
Date: Sat Dec 3 01:10:45 2016
New Revision: 309459
URL: https://svnweb.freebsd.org/changeset/base/309459
Log:
MFC 303348:
cxgbe(4): Initialize the adapter queues (fwq and mgmtq) instead of
returning EAGAIN if they aren't available when the user tries to program
a filter. Do this after validating the filter so that the driver
doesn't bring up the queues if it doesn't have to.
Modified:
stable/11/sys/dev/cxgbe/t4_main.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sys/dev/cxgbe/t4_main.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/11/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_main.c Sat Dec 3 01:04:59 2016 (r309458)
+++ stable/11/sys/dev/cxgbe/t4_main.c Sat Dec 3 01:10:45 2016 (r309459)
@@ -7960,11 +7960,6 @@ set_filter(struct adapter *sc, struct t4
goto done;
}
- if (!(sc->flags & FULL_INIT_DONE)) {
- rc = EAGAIN;
- goto done;
- }
-
if (t->idx >= nfilters) {
rc = EINVAL;
goto done;
@@ -7998,6 +7993,10 @@ set_filter(struct adapter *sc, struct t4
goto done;
}
+ if (!(sc->flags & FULL_INIT_DONE) &&
+ ((rc = adapter_full_init(sc)) != 0))
+ goto done;
+
if (sc->tids.ftid_tab == NULL) {
KASSERT(sc->tids.ftids_in_use == 0,
("%s: no memory allocated but filters_in_use > 0",
More information about the svn-src-stable
mailing list