Merge branch 'net-hdlc_fr-clean-up-some-code-style-issues'