Merge branch 'systemport-net'
authorDavid S. Miller <davem@davemloft.net>
Tue, 28 Oct 2014 21:08:56 +0000 (17:08 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 Oct 2014 21:08:56 +0000 (17:08 -0400)
commit9ffa1fcaef222026a8e031830f8db29d3f2cfc47
treeaca2c9c6337b62a19dd145759c9aaab1568a26ee
parentebcf34f3d4be11f994340aff629f3c17171a4f65
parent704d33e7006f20f9b4fa7d24a0f08c4b5919b131
Merge branch 'systemport-net'

Florian Fainelli says:

====================
net: systemport: RX path and suspend fixes

These two patches fix a race condition where we have our RX interrupts
enabled, but not NAPI for the RX path, and the second patch fixes an
issue for packets stuck in RX fifo during a suspend/resume cycle.
====================

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