Merge branch 'nfp-cleanups-and-RX-path-rewrite'
authorDavid S. Miller <davem@davemloft.net>
Tue, 1 Nov 2016 15:05:01 +0000 (11:05 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Nov 2016 15:05:01 +0000 (11:05 -0400)
Jakub Kicinski says:

====================
nfp: cleanups and RX path rewrite

This series lays groundwork for upcoming XDP support by updating
the RX path not to pre-allocate sk_buffs.  I start with few
cleanups, removal of NFP3200-related code being the most significant.
Patch 7 moves to alloc_frag() and build_skb() APIs.  Again, a number
of small cleanups follow.  The set ends with adding support for
different number of RX and TX rings.
====================

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

Trivial merge