Merge branch 'nfp-fixes'

Browse source

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>

...

This commit is contained in:

David S. Miller 2018-06-12 15:18:28 -07:00

parent cdb8744d80 e62e51af34

commit 01a1a170da

5 changed files with 11 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/net/ethernet/netronome/nfp/flower/main.c

View file

2

drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c

View file

4

drivers/net/ethernet/netronome/nfp/nfp_net.h

View file

4

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

View file

7

drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c

View file