Merge branch 'bcmgenet_systemport_stats'
authorDavid S. Miller <davem@davemloft.net>
Sun, 1 Mar 2015 19:02:24 +0000 (14:02 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 1 Mar 2015 19:02:24 +0000 (14:02 -0500)
commit38674a49f33a9b3ce4eafb8bbd4b18744b3943f9
tree7c5b4a3d35b7e0deac03d2691a636c76d1ca8b65
parent765dd3bb44711b4ba36c1e06f9c4b7bfe73ffef7
parent55ff4ea9a853f5ec9a8290c0ccc1d00c97e49f82
Merge branch 'bcmgenet_systemport_stats'

Florian Fainelli says:

====================
net: bcmgenet and systemport statistics fixes

This two patches fix a similar problem in the GENET and SYSTEMPORT drivers
for software maintained statistics used to track DMA mapping and SKB
re-allocation failures.
====================

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