| commit | 916d08f640092397f403924f9b061d7d883a8217 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Jan 10 11:29:44 2020 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Fri Jan 10 11:29:44 2020 -0800 |
| tree | a2973e5cdcf933d7e07212db76266d359bf5131f | |
| parent | 7112f8b075b4565fb81bcd472433f9f1eea3dcb8 [diff] | |
| parent | e735def0186770d9a2904bee6ee82a4e6dd99578 [diff] |
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 <davem@davemloft.net>