New upstream version 18.08

[deb_dpdk.git] / drivers / net / bnx2x / ecore_sp.c

diff --git a/drivers/net/bnx2x/ecore_sp.c b/drivers/net/bnx2x/ecore_sp.c
index e6fecd8..0c8685c 100644 (file)
--- a/drivers/net/bnx2x/ecore_sp.c
+++ b/drivers/net/bnx2x/ecore_sp.c
@@ -1,16 +1,14 @@
-/*-
- * Copyright (c) 2007-2013 QLogic Corporation. All rights reserved.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2007-2013 Broadcom Corporation.
  *
  * Eric Davis        <edavis@broadcom.com>
  * David Christensen <davidch@broadcom.com>
  * Gary Zambrano     <zambrano@broadcom.com>
  *
  * Copyright (c) 2013-2015 Brocade Communications Systems, Inc.
- * Copyright (c) 2015 QLogic Corporation.
+ * Copyright (c) 2015-2018 Cavium Inc.
  * All rights reserved.
- * www.qlogic.com
- *
- * See LICENSE.bnx2x_pmd for copyright and licensing details.
+ * www.cavium.com
  */
 
 #include "bnx2x.h"
@@ -2676,7 +2674,7 @@ static void ecore_mcast_hdl_del(struct bnx2x_softc *sc,
  * @cmd:
  * @start_cnt: first line in the ramrod data that may be used
  *
- * This function is called iff there is enough place for the current command in
+ * This function is called if there is enough place for the current command in
  * the ramrod data.
  * Returns number of lines filled in the ramrod data in total.
  */
@@ -2725,7 +2723,7 @@ static int ecore_mcast_validate_e2(__rte_unused struct bnx2x_softc *sc,
                /* DEL command deletes all currently configured MACs */
        case ECORE_MCAST_CMD_DEL:
                o->set_registry_size(o, 0);
-               /* Don't break */
+               /* fall-through */
 
                /* RESTORE command will restore the entire multicast configuration */
        case ECORE_MCAST_CMD_RESTORE:
@@ -2834,7 +2832,7 @@ static int ecore_mcast_setup_e2(struct bnx2x_softc *sc,
        if (ECORE_LIST_IS_EMPTY(&o->pending_cmds_head))
                o->clear_sched(o);
 
-       /* The below may be TRUE iff there was enough room in ramrod
+       /* The below may be TRUE if there was enough room in ramrod
         * data for all pending commands and for the current
         * command. Otherwise the current command would have been added
         * to the pending commands and p->mcast_list_len would have been
@@ -3402,7 +3400,7 @@ void ecore_init_mac_credit_pool(struct bnx2x_softc *sc,
                /* CAM credit is equally divided between all active functions
                 * on the PORT!.
                 */
-               if ((func_num > 0)) {
+               if (func_num > 0) {
                        if (!CHIP_REV_IS_SLOW(sc))
                                cam_sz = (MAX_MAC_CREDIT_E1H / (2 * func_num));
                        else
@@ -3419,7 +3417,7 @@ void ecore_init_mac_credit_pool(struct bnx2x_softc *sc,
                 * CAM credit is equaly divided between all active functions
                 * on the PATH.
                 */
-               if ((func_num > 0)) {
+               if (func_num > 0) {
                        if (!CHIP_REV_IS_SLOW(sc))
                                cam_sz = (MAX_MAC_CREDIT_E2 / func_num);
                        else