Merge branch 'sfc-misc-fixes'

Edward Cree says:

====================
sfc: misc. fixes

Three largely unrelated fixes to increase robustness in rare edge cases.
====================

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