Pieter Jansen van Vuuren 745eaf9afe nfp: fix vlan receive MAC statistics typo ...

Correct typo in vlan receive MAC stats. Previously the MAC statistics
reported in ethtool for vlan receive contained a typo resulting in ethtool
reporting rx_vlan_reveive_ok instead of rx_vlan_received_ok.

Fixes: a5950182c0 ("nfp: map mac_stats and vf_cfg BARs")
Fixes: 098ce840c9 ("nfp: report MAC statistics in ethtool")
Reported-by: Brendan Galloway <brendan.galloway@netronome.com>
Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2017-11-17 14:09:35 +09:00

..

accessibility

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

acpi

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

amba

Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping

2017-11-14 16:54:12 -08:00

android

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

ata

Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

2017-11-15 14:11:41 -08:00

atm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2017-11-15 11:56:19 -08:00

auxdisplay

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

base

Merge tag 'devicetree-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

2017-11-14 18:25:40 -08:00

bcma

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2017-11-15 11:56:19 -08:00

block

Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping

2017-11-14 16:54:12 -08:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-04 09:26:51 +09:00

bus

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2017-11-15 10:56:56 -08:00

cdrom

Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block

2017-11-14 15:32:19 -08:00

char

Merge tag 'ipmi-for-4.15' of git://github.com/cminyard/linux-ipmi

2017-11-15 15:12:28 -08:00

clk

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2017-11-03 13:56:15 -07:00

clocksource

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2017-11-15 10:56:56 -08:00

connector

drivers, connector: convert cn_callback_entry.refcnt from atomic_t to refcount_t

2017-10-22 02:22:39 +01:00

cpufreq

Merge tag 'pm-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2017-11-13 19:43:50 -08:00

cpuidle

Merge branch 'pm-cpuidle'

2017-11-13 01:34:14 +01:00

crypto

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2017-11-14 10:52:09 -08:00

dax

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

dca

…

devfreq

Merge branches 'pm-devfreq' and 'pm-tools'

2017-11-13 01:41:39 +01:00

dio

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

dma

Merge tag 'dmaengine-4.15-rc1' of git://git.infradead.org/users/vkoul/slave-dma

2017-11-14 16:49:31 -08:00

dma-buf

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

edac

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

eisa

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

extcon

Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2017-11-13 21:14:07 -08:00

firewire

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

firmware

Merge branch 'linus' into locking/core, to resolve conflicts

2017-11-07 10:32:44 +01:00

fmc

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

fpga

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

fsi

…

gpio

Merge branch 'i2c/for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2017-11-14 17:52:21 -08:00

gpu

Merge tag 'devicetree-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

2017-11-14 18:25:40 -08:00

hid

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

hsi

Merge tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

2017-11-15 13:35:43 -08:00

hv

x86/virt: Add enum for hypervisors to replace x86_hyper

2017-11-10 10:03:12 +01:00

hwmon

Merge tag 'hwmon-for-linus-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

2017-11-13 08:55:46 -08:00

hwspinlock

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

hwtracing

Merge tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs

2017-11-14 14:44:04 -08:00

i2c

Merge branch 'i2c/for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2017-11-14 17:52:21 -08:00

ide

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

idle

Merge branch 'pm-cpuidle'

2017-11-13 01:34:14 +01:00

iio

Merge tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs

2017-11-14 14:44:04 -08:00

infiniband

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

2017-11-15 14:54:53 -08:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2017-11-14 18:07:18 -08:00

iommu

Merge tag 'iommu-v4.15-rc1' of git://github.com/awilliam/linux-vfio

2017-11-14 16:43:27 -08:00

ipack

…

irqchip

Merge tag 'pci-v4.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2017-11-15 15:01:28 -08:00

isdn

isdn: hisax: Fix pnp_irq's error checking for setup_teles3

2017-11-16 22:31:16 +09:00

leds

Merge tag 'leds_for_4.15rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds

2017-11-14 18:09:31 -08:00

lightnvm

Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block

2017-11-14 15:32:19 -08:00

macintosh

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

mailbox

Merge tag 'mailbox-v4.15' of git://git.linaro.org/landing-teams/working/fujitsu/integration

2017-11-15 13:39:18 -08:00

mcb

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

md

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

media

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

memory

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

memstick

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

message

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

mfd

Merge tag 'sound-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2017-11-14 18:01:46 -08:00

misc

Merge tag 'pci-v4.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2017-11-15 15:01:28 -08:00

mmc

Merge tag 'mmc-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

2017-11-13 10:17:35 -08:00

mtd

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

mux

…

net

nfp: fix vlan receive MAC statistics typo

2017-11-17 14:09:35 +09:00

nfc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2017-11-15 11:56:19 -08:00

ntb

…

nubus

Merge tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2017-11-13 12:10:24 -08:00

nvdimm

Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2017-11-15 10:14:11 -08:00

nvme

Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block

2017-11-14 15:32:19 -08:00

nvmem

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

of

Merge tag 'pci-v4.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2017-11-15 15:01:28 -08:00

opp

…

oprofile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

parisc

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

parport

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

pci

Merge tag 'pci-v4.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2017-11-15 15:01:28 -08:00

pcmcia

Merge tag 'pci-v4.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2017-11-15 15:01:28 -08:00

perf

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2017-11-15 10:56:56 -08:00

phy

Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2017-11-13 21:14:07 -08:00

pinctrl

Merge tag 'gpio-v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

2017-11-14 17:23:44 -08:00

platform

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

pnp

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

power

Merge tag 'for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

2017-11-15 13:37:15 -08:00

powercap

…

pps

…

ps3

…

ptp

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

pwm

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

rapidio

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

ras

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

regulator

Merge tag 'mmc-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

2017-11-13 10:17:35 -08:00

remoteproc

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

reset

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

rpmsg

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

rtc

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

s390

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2017-11-15 11:56:19 -08:00

sbus

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

scsi

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

sfi

…

sh

Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping

2017-11-14 16:54:12 -08:00

sn

…

soc

Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2017-11-13 21:14:07 -08:00

spi

Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spreadtrum' and 'spi/topic/tegra114' into spi-next

2017-11-10 21:33:51 +00:00

spmi

…

ssb

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

staging

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

2017-11-15 14:54:53 -08:00

target

Merge tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs

2017-11-14 14:44:04 -08:00

tc

…

tee

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

thermal

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

thunderbolt

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-04 09:26:51 +09:00

tty

Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

2017-11-15 13:46:33 -08:00

uio

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

usb

Merge tag 'sound-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2017-11-14 18:01:46 -08:00

uwb

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

vfio

Merge tag 'vfio-v4.15-rc1' of git://github.com/awilliam/linux-vfio

2017-11-14 16:47:47 -08:00

vhost

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2017-11-15 11:56:19 -08:00

video

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

virt

…

virtio

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

vlynq

…

vme

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

w1

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

watchdog

Merge tag 'mips_4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips

2017-11-15 11:36:08 -08:00

xen

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 17:56:58 -08:00

zorro

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Kconfig

Merge branches 'pm-cpufreq-sched' and 'pm-opp'

2017-11-13 01:40:52 +01:00

Makefile

Merge branches 'pm-cpufreq-sched' and 'pm-opp'

2017-11-13 01:40:52 +01:00