diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-10 23:18:34 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-10 23:18:34 +0300 |
| commit | befc7a3324b45b7478b29861f2a77f8b2bc17922 (patch) | |
| tree | 97ba442e53e8eb00ea1527077fbd67c3179c5a32 /net/core/sock.c | |
| parent | 3668bb8da197f90c2e9cb71e89da6fa629ff8450 (diff) | |
| parent | 5f0ca2fb71e28df146f590eebfe32b41171b737f (diff) | |
| download | linux-befc7a3324b45b7478b29861f2a77f8b2bc17922.tar.xz | |
Merge branch 'nfp-fix-ethtool-stats-and-page-allocation'
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 325945ede6d4 ("nfp: split software and hardware
vNIC statistics") which is in net.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
0 files changed, 0 insertions, 0 deletions