From: David S. Miller <davem@davemloft.net>
Date: Tue, 12 Jun 2018 22:18:28 +0000 (-0700)
Subject: Merge branch 'nfp-fixes'
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=01a1a170da677d85ced3438f09369293e812c8b1;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'nfp-fixes'

Jakub Kicinski says:

====================
nfp: fix a warning, stats, naming and route leak

Various fixes for the NFP.  Patch 1 fixes a harmless GCC 8 warning.
Patch 2 ensures statistics are correct after users decrease the number
of channels/rings.  Patch 3 restores phy_port_name behaviour for flower,
ndo_get_phy_port_name used to return -EOPNOTSUPP on one of the netdevs,
and we need to keep it that way otherwise interface names may change.
Patch 4 fixes refcnt leak in flower tunnel offload code.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

01a1a170da677d85ced3438f09369293e812c8b1