> > +	return __htobe16(x);
> 
> This looks the wrong way around. ntohs() is be16toh(). Same for ntohl
> above. While it does not matter for our cases I think we should use the
> right conversions here.

I had this concern, too, but since we define be16toh as __htobe16 this
doesn't really matter.