Merge branch 'nfp-fix-ethtool-stats-and-page-allocation'

Browse source

Jakub Kicinski says:

====================
nfp: fix ethtool stats and page allocation

Two fixes for net.  First one makes sure we handle gather of stats on
32bit machines correctly (ouch).  The second fix solves a potential
NULL-deref if we fail to allocate a page with XDP running.

I used Fixes: tags pointing to where the bug was introduced, but for
patch 1 it has been in the driver "for ever" and fix won't backport
cleanly beyond commit 325945ede6 ("nfp: split software and hardware
vNIC statistics") which is in net.
====================

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

...

This commit is contained in:

David S. Miller 2017-10-10 13:18:34 -07:00

parent 3668bb8da1 5f0ca2fb71

commit befc7a3324

2 changed files with 19 additions and 9 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

20

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

View file

8

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

View file