common/sfc_efx/base: refactor RSS table entry count name

In the existing code, "n" is hardly a clear name for that.
Use a clearer name to help future maintainers of the code.

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Andy Moreton <amoreton@xilinx.com>

diff --git a/drivers/common/sfc_efx/base/ef10_impl.h b/drivers/common/sfc_efx/base/ef10_impl.h
index d48f2384795b328071dbb7a58a45c49eaf774cd2..597dd24909527a04821068eb63558fb11a57faf8 100644 (file)
--- a/drivers/common/sfc_efx/base/ef10_impl.h
+++ b/drivers/common/sfc_efx/base/ef10_impl.h
@@ -1163,12 +1163,12 @@ ef10_rx_scale_key_set(
        __in            size_t n);
 
 LIBEFX_INTERNAL
-extern __checkReturn   efx_rc_t
+extern __checkReturn           efx_rc_t
 ef10_rx_scale_tbl_set(
-       __in            efx_nic_t *enp,
-       __in            uint32_t rss_context,
-       __in_ecount(n)  unsigned int *table,
-       __in            size_t n);
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t rss_context,
+       __in_ecount(nentries)   unsigned int *table,
+       __in                    size_t nentries);
 
 LIBEFX_INTERNAL
 extern __checkReturn   uint32_t

diff --git a/drivers/common/sfc_efx/base/ef10_rx.c b/drivers/common/sfc_efx/base/ef10_rx.c
index 3b041b962e70b8b309b80fa71d842d7614afaf43..5008139a3f0b1d432e906bceca65c7894d0742e5 100644 (file)
--- a/drivers/common/sfc_efx/base/ef10_rx.c
+++ b/drivers/common/sfc_efx/base/ef10_rx.c
@@ -292,12 +292,12 @@ fail1:
 #endif /* EFSYS_OPT_RX_SCALE */
 
 #if EFSYS_OPT_RX_SCALE
-static                 efx_rc_t
+static                         efx_rc_t
 efx_mcdi_rss_context_set_table(
-       __in            efx_nic_t *enp,
-       __in            uint32_t rss_context,
-       __in_ecount(n)  unsigned int *table,
-       __in            size_t n)
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t rss_context,
+       __in_ecount(nentries)   unsigned int *table,
+       __in                    size_t nentries)
 {
        efx_mcdi_req_t req;
        EFX_MCDI_DECLARE_BUF(payload, MC_CMD_RSS_CONTEXT_SET_TABLE_IN_LEN,
@@ -325,7 +325,8 @@ efx_mcdi_rss_context_set_table(
        for (i = 0;
            i < MC_CMD_RSS_CONTEXT_SET_TABLE_IN_INDIRECTION_TABLE_LEN;
            i++) {
-               req_table[i] = (n > 0) ? (uint8_t)table[i % n] : 0;
+               req_table[i] = (nentries > 0) ?
+                   (uint8_t)table[i % nentries] : 0;
        }
 
        efx_mcdi_execute(enp, &req);
@@ -514,12 +515,12 @@ fail1:
 #endif /* EFSYS_OPT_RX_SCALE */
 
 #if EFSYS_OPT_RX_SCALE
-       __checkReturn   efx_rc_t
+       __checkReturn           efx_rc_t
 ef10_rx_scale_tbl_set(
-       __in            efx_nic_t *enp,
-       __in            uint32_t rss_context,
-       __in_ecount(n)  unsigned int *table,
-       __in            size_t n)
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t rss_context,
+       __in_ecount(nentries)   unsigned int *table,
+       __in                    size_t nentries)
 {
        efx_rc_t rc;
 
@@ -533,7 +534,7 @@ ef10_rx_scale_tbl_set(
        }
 
        if ((rc = efx_mcdi_rss_context_set_table(enp,
-                   rss_context, table, n)) != 0)
+                   rss_context, table, nentries)) != 0)
                goto fail2;
 
        return (0);

diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h
index f875487b89f0fb4d3dbba35bad5b560094fc77b2..a35e29ebcf9bb07a34d42284f7603fe403253556 100644 (file)
--- a/drivers/common/sfc_efx/base/efx.h
+++ b/drivers/common/sfc_efx/base/efx.h
@@ -2903,12 +2903,12 @@ efx_rx_scale_mode_set(
        __in    boolean_t insert);
 
 LIBEFX_API
-extern __checkReturn   efx_rc_t
+extern __checkReturn           efx_rc_t
 efx_rx_scale_tbl_set(
-       __in            efx_nic_t *enp,
-       __in            uint32_t rss_context,
-       __in_ecount(n)  unsigned int *table,
-       __in            size_t n);
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t rss_context,
+       __in_ecount(nentries)   unsigned int *table,
+       __in                    size_t nentries);
 
 LIBEFX_API
 extern __checkReturn   efx_rc_t

diff --git a/drivers/common/sfc_efx/base/efx_rx.c b/drivers/common/sfc_efx/base/efx_rx.c
index 7e63363be7efb92e6676b130750b6dd850e7d62d..eb3f736f6384d6f35225cd94f6f7dec649c9d20e 100644 (file)
--- a/drivers/common/sfc_efx/base/efx_rx.c
+++ b/drivers/common/sfc_efx/base/efx_rx.c
@@ -41,12 +41,12 @@ siena_rx_scale_key_set(
        __in_ecount(n)  uint8_t *key,
        __in            size_t n);
 
-static __checkReturn   efx_rc_t
+static __checkReturn           efx_rc_t
 siena_rx_scale_tbl_set(
-       __in            efx_nic_t *enp,
-       __in            uint32_t rss_context,
-       __in_ecount(n)  unsigned int *table,
-       __in            size_t n);
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t rss_context,
+       __in_ecount(nentries)   unsigned int *table,
+       __in                    size_t nentries);
 
 static __checkReturn   uint32_t
 siena_rx_prefix_hash(
@@ -690,12 +690,12 @@ fail1:
 #endif /* EFSYS_OPT_RX_SCALE */
 
 #if EFSYS_OPT_RX_SCALE
-       __checkReturn   efx_rc_t
+       __checkReturn           efx_rc_t
 efx_rx_scale_tbl_set(
-       __in            efx_nic_t *enp,
-       __in            uint32_t rss_context,
-       __in_ecount(n)  unsigned int *table,
-       __in            size_t n)
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t rss_context,
+       __in_ecount(nentries)   unsigned int *table,
+       __in                    size_t nentries)
 {
        const efx_rx_ops_t *erxop = enp->en_erxop;
        efx_rc_t rc;
@@ -703,7 +703,8 @@ efx_rx_scale_tbl_set(
        EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_RX);
 
-       if ((rc = erxop->erxo_scale_tbl_set(enp, rss_context, table, n)) != 0)
+       if ((rc = erxop->erxo_scale_tbl_set(enp, rss_context, table,
+                   nentries)) != 0)
                goto fail1;
 
        return (0);
@@ -1419,12 +1420,12 @@ fail1:
 #endif
 
 #if EFSYS_OPT_RX_SCALE
-static __checkReturn   efx_rc_t
+static __checkReturn           efx_rc_t
 siena_rx_scale_tbl_set(
-       __in            efx_nic_t *enp,
-       __in            uint32_t rss_context,
-       __in_ecount(n)  unsigned int *table,
-       __in            size_t n)
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t rss_context,
+       __in_ecount(nentries)   unsigned int *table,
+       __in                    size_t nentries)
 {
        efx_oword_t oword;
        int index;
@@ -1438,7 +1439,7 @@ siena_rx_scale_tbl_set(
                goto fail1;
        }
 
-       if (n > FR_BZ_RX_INDIRECTION_TBL_ROWS) {
+       if (nentries > FR_BZ_RX_INDIRECTION_TBL_ROWS) {
                rc = EINVAL;
                goto fail2;
        }
@@ -1447,7 +1448,7 @@ siena_rx_scale_tbl_set(
                uint32_t byte;
 
                /* Calculate the entry to place in the table */
-               byte = (n > 0) ? (uint32_t)table[index % n] : 0;
+               byte = (nentries > 0) ? (uint32_t)table[index % nentries] : 0;
 
                EFSYS_PROBE2(table, int, index, uint32_t, byte);
 
@@ -1462,7 +1463,7 @@ siena_rx_scale_tbl_set(
                uint32_t byte;
 
                /* Determine if we're starting a new batch */
-               byte = (n > 0) ? (uint32_t)table[index % n] : 0;
+               byte = (nentries > 0) ? (uint32_t)table[index % nentries] : 0;
 
                /* Read the table */
                EFX_BAR_TBL_READO(enp, FR_BZ_RX_INDIRECTION_TBL,

diff --git a/drivers/common/sfc_efx/base/rhead_impl.h b/drivers/common/sfc_efx/base/rhead_impl.h
index dd38ded7751ce3fc1363e62387ae1914e5844379..e0d95ba2aa8ed9298dbef9fd7c0aedc55005e570 100644 (file)
--- a/drivers/common/sfc_efx/base/rhead_impl.h
+++ b/drivers/common/sfc_efx/base/rhead_impl.h
@@ -287,12 +287,12 @@ rhead_rx_scale_key_set(
        __in            size_t n);
 
 LIBEFX_INTERNAL
-extern __checkReturn   efx_rc_t
+extern __checkReturn           efx_rc_t
 rhead_rx_scale_tbl_set(
-       __in            efx_nic_t *enp,
-       __in            uint32_t rss_context,
-       __in_ecount(n)  unsigned int *table,
-       __in            size_t n);
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t rss_context,
+       __in_ecount(nentries)   unsigned int *table,
+       __in                    size_t nentries);
 
 LIBEFX_INTERNAL
 extern __checkReturn   uint32_t

diff --git a/drivers/common/sfc_efx/base/rhead_rx.c b/drivers/common/sfc_efx/base/rhead_rx.c
index 7b9a4af9daaae9db9c735e8d3d43fc43b1148d86..d28f936ab79c9c4886374ccfb2c6465ef9eb4f4c 100644 (file)
--- a/drivers/common/sfc_efx/base/rhead_rx.c
+++ b/drivers/common/sfc_efx/base/rhead_rx.c
@@ -162,16 +162,16 @@ fail1:
        return (rc);
 }
 
-       __checkReturn   efx_rc_t
+       __checkReturn           efx_rc_t
 rhead_rx_scale_tbl_set(
-       __in            efx_nic_t *enp,
-       __in            uint32_t rss_context,
-       __in_ecount(n)  unsigned int *table,
-       __in            size_t n)
+       __in                    efx_nic_t *enp,
+       __in                    uint32_t rss_context,
+       __in_ecount(nentries)   unsigned int *table,
+       __in                    size_t nentries)
 {
        efx_rc_t rc;
 
-       rc = ef10_rx_scale_tbl_set(enp, rss_context, table, n);
+       rc = ef10_rx_scale_tbl_set(enp, rss_context, table, nentries);
        if (rc != 0)
                goto fail1;