Merge branch 'r8169-replace-some-magic-with-more-speaking-functions'