]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
sfc: remove ctpio_dmabuf_start from stats
authorBert Kenward <bkenward@solarflare.com>
Wed, 4 Apr 2018 15:40:30 +0000 (16:40 +0100)
committerSultan Alsawaf <sultan.alsawaf@canonical.com>
Wed, 24 Jul 2019 15:45:15 +0000 (09:45 -0600)
BugLink: https://bugs.launchpad.net/bugs/1836635
The ctpio_dmabuf_start entry is not actually a stat and shouldn't
be exposed to ethtool.

Fixes: 2c0b6ee837db ("sfc: expose CTPIO stats on NICs that support them")
Signed-off-by: Bert Kenward <bkenward@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 458bd99e49742c225f75501591573959c7ef50a2)
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/net/ethernet/sfc/ef10.c
drivers/net/ethernet/sfc/nic.h

index 75fbf58e421c327f52bbed81d60a53e8c456d118..554888d6759762d00f04a73667d28a693e0743ae 100644 (file)
@@ -1670,7 +1670,6 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = {
        EF10_DMA_STAT(fec_corrected_symbols_lane1, FEC_CORRECTED_SYMBOLS_LANE1),
        EF10_DMA_STAT(fec_corrected_symbols_lane2, FEC_CORRECTED_SYMBOLS_LANE2),
        EF10_DMA_STAT(fec_corrected_symbols_lane3, FEC_CORRECTED_SYMBOLS_LANE3),
-       EF10_DMA_STAT(ctpio_dmabuf_start, CTPIO_DMABUF_START),
        EF10_DMA_STAT(ctpio_vi_busy_fallback, CTPIO_VI_BUSY_FALLBACK),
        EF10_DMA_STAT(ctpio_long_write_success, CTPIO_LONG_WRITE_SUCCESS),
        EF10_DMA_STAT(ctpio_missing_dbell_fail, CTPIO_MISSING_DBELL_FAIL),
@@ -1781,7 +1780,6 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = {
  * These bits are in the second u64 of the raw mask.
  */
 #define EF10_CTPIO_STAT_MASK (                                         \
-       (1ULL << (EF10_STAT_ctpio_dmabuf_start - 64)) |                 \
        (1ULL << (EF10_STAT_ctpio_vi_busy_fallback - 64)) |             \
        (1ULL << (EF10_STAT_ctpio_long_write_success - 64)) |           \
        (1ULL << (EF10_STAT_ctpio_missing_dbell_fail - 64)) |           \
index 6549fc685a48f7c98e920da9634cc1b7d53ec087..7642f6da33668860c098818f0b8ddb3193bd42ba 100644 (file)
@@ -332,7 +332,6 @@ enum {
        EF10_STAT_fec_corrected_symbols_lane1,
        EF10_STAT_fec_corrected_symbols_lane2,
        EF10_STAT_fec_corrected_symbols_lane3,
-       EF10_STAT_ctpio_dmabuf_start,
        EF10_STAT_ctpio_vi_busy_fallback,
        EF10_STAT_ctpio_long_write_success,
        EF10_STAT_ctpio_missing_dbell_fail,