New upstream version 18.02

[deb_dpdk.git] / drivers / net / sfc / base / efx_mac.c

diff --git a/drivers/net/sfc/base/efx_mac.c b/drivers/net/sfc/base/efx_mac.c
index 752e720..511f3eb 100644 (file)
--- a/drivers/net/sfc/base/efx_mac.c
+++ b/drivers/net/sfc/base/efx_mac.c
@@ -1,31 +1,7 @@
-/*
- * Copyright (c) 2007-2016 Solarflare Communications Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
  *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of the FreeBSD Project.
+ * Copyright (c) 2007-2018 Solarflare Communications Inc.
+ * All rights reserved.
  */
 
 #include "efx.h"
@@ -40,7 +16,7 @@ siena_mac_multicast_list_set(
 #endif /* EFSYS_OPT_SIENA */
 
 #if EFSYS_OPT_SIENA
-static const efx_mac_ops_t     __efx_siena_mac_ops = {
+static const efx_mac_ops_t     __efx_mac_siena_ops = {
        siena_mac_poll,                         /* emo_poll */
        siena_mac_up,                           /* emo_up */
        siena_mac_reconfigure,                  /* emo_addr_set */
@@ -64,7 +40,7 @@ static const efx_mac_ops_t    __efx_siena_mac_ops = {
 #endif /* EFSYS_OPT_SIENA */
 
 #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
-static const efx_mac_ops_t     __efx_ef10_mac_ops = {
+static const efx_mac_ops_t     __efx_mac_ef10_ops = {
        ef10_mac_poll,                          /* emo_poll */
        ef10_mac_up,                            /* emo_up */
        ef10_mac_addr_set,                      /* emo_addr_set */
@@ -751,16 +727,9 @@ efx_mac_stats_upload(
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PORT);
        EFSYS_ASSERT(emop != NULL);
 
-       /*
-        * Don't assert !ep_mac_stats_pending, because the client might
-        * have failed to finalise statistics when previously stopping
-        * the port.
-        */
        if ((rc = emop->emo_stats_upload(enp, esmp)) != 0)
                goto fail1;
 
-       epp->ep_mac_stats_pending = B_TRUE;
-
        return (0);
 
 fail1:
@@ -820,8 +789,6 @@ efx_mac_stats_update(
        EFSYS_ASSERT(emop != NULL);
 
        rc = emop->emo_stats_update(enp, esmp, essp, generationp);
-       if (rc == 0)
-               epp->ep_mac_stats_pending = B_FALSE;
 
        return (rc);
 }
@@ -840,21 +807,21 @@ efx_mac_select(
        switch (enp->en_family) {
 #if EFSYS_OPT_SIENA
        case EFX_FAMILY_SIENA:
-               emop = &__efx_siena_mac_ops;
+               emop = &__efx_mac_siena_ops;
                type = EFX_MAC_SIENA;
                break;
 #endif /* EFSYS_OPT_SIENA */
 
 #if EFSYS_OPT_HUNTINGTON
        case EFX_FAMILY_HUNTINGTON:
-               emop = &__efx_ef10_mac_ops;
+               emop = &__efx_mac_ef10_ops;
                type = EFX_MAC_HUNTINGTON;
                break;
 #endif /* EFSYS_OPT_HUNTINGTON */
 
 #if EFSYS_OPT_MEDFORD
        case EFX_FAMILY_MEDFORD:
-               emop = &__efx_ef10_mac_ops;
+               emop = &__efx_mac_ef10_ops;
                type = EFX_MAC_MEDFORD;
                break;
 #endif /* EFSYS_OPT_MEDFORD */