From: David S. Miller Date: Fri, 10 Jan 2020 19:29:44 +0000 (-0800) Subject: Merge branch 'stmmac-Frame-Preemption-fixes' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=916d08f640092397f403924f9b061d7d883a8217;p=linux.git Merge branch 'stmmac-Frame-Preemption-fixes' Jose Abreu says: ==================== net: stmmac: Frame Preemption fixes Two single fixes for the -next tree for recently introduced Frame Preemption feature. 1) and 2) fixes the disabling of Frame Preemption that was not being correctly handled because of a missing return. ==================== Signed-off-by: David S. Miller --- 916d08f640092397f403924f9b061d7d883a8217