This begins to fix regressions reported by Frans Pop on his Ultra-10.

There are still some funnies left that we are investigating.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>