svn commit: r355595 - head/sys/dev/cxgbe

[Navdeep Parhar]

Author: np
Date: Tue Dec 10 20:12:21 2019
New Revision: 355595
URL: https://svnweb.freebsd.org/changeset/base/355595

Log:
  cxgbe(4): Simplify the firmware version checks a bit.
  
  No functional change.
  
  MFC after:    1 week

Modified:
  head/sys/dev/cxgbe/t4_main.c

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c        Tue Dec 10 20:11:39 2019        
(r355594)
+++ head/sys/dev/cxgbe/t4_main.c        Tue Dec 10 20:12:21 2019        
(r355595)
@@ -4251,9 +4251,8 @@ set_params__pre_init(struct adapter *sc)
                val = 1;
                rc = -t4_set_params(sc, sc->mbox, sc->pf, 0, 1, &param, &val);
                /* firmwares < 1.20.1.0 do not have this param. */
-               if (rc == FW_EINVAL && sc->params.fw_vers <
-                   (V_FW_HDR_FW_VER_MAJOR(1) | V_FW_HDR_FW_VER_MINOR(20) |
-                   V_FW_HDR_FW_VER_MICRO(1) | V_FW_HDR_FW_VER_BUILD(0))) {
+               if (rc == FW_EINVAL &&
+                   sc->params.fw_vers < FW_VERSION32(1, 20, 1, 0)) {
                        rc = 0;
                }
                if (rc != 0) {
@@ -4418,9 +4417,7 @@ get_params__post_init(struct adapter *sc)
                        return (rc);
                }
                sc->tids.ntids = val[0];
-               if (sc->params.fw_vers <
-                   (V_FW_HDR_FW_VER_MAJOR(1) | V_FW_HDR_FW_VER_MINOR(20) |
-                   V_FW_HDR_FW_VER_MICRO(5) | V_FW_HDR_FW_VER_BUILD(0))) {
+               if (sc->params.fw_vers < FW_VERSION32(1, 20, 5, 0)) {
                        MPASS(sc->tids.ntids >= sc->tids.nhpftids);
                        sc->tids.ntids -= sc->tids.nhpftids;
                }
@@ -4460,9 +4457,7 @@ get_params__post_init(struct adapter *sc)
                        return (rc);
                }
                sc->tids.ntids = val[0];
-               if (sc->params.fw_vers <
-                   (V_FW_HDR_FW_VER_MAJOR(1) | V_FW_HDR_FW_VER_MINOR(20) |
-                   V_FW_HDR_FW_VER_MICRO(5) | V_FW_HDR_FW_VER_BUILD(0))) {
+               if (sc->params.fw_vers < FW_VERSION32(1, 20, 5, 0)) {
                        MPASS(sc->tids.ntids >= sc->tids.nhpftids);
                        sc->tids.ntids -= sc->tids.nhpftids;
                }
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"