MFC r232748:

MFC r232748:

After r232745, which makes sure __bswap16(), ntohs() and htons() return
__uint16_t, we can partially undo r228668.

Note the remark "Work around a clang false positive with format string
warnings and ntohs macros (see LLVM PR 11313)" was actually incorrect.

Before r232745, on some arches, the ntohs() macros did in fact return
int, not uint16_t, so clang was right in warning about the %hu format
string.

git-svn-id: svn://svn.freebsd.org/base/stable/9@233350 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f