From: David S. Miller Date: Tue, 28 Oct 2014 21:08:56 +0000 (-0400) Subject: Merge branch 'systemport-net' X-Git-Tag: v3.18-rc3~17^2~26 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=9ffa1fcaef222026a8e031830f8db29d3f2cfc47 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 --- 9ffa1fcaef222026a8e031830f8db29d3f2cfc47