Catch up to the changes from r251874.  This isn't an MFC because the
amd(4) driver no longer exists in FreeBSD 10.

Obtained from:	Netflix
MFC r251187:

Explicitly use a pair of parentheses to ensure correct evaluation
ordering for bitwise operation.

Submitted by:	swildner (DragonFly)
MFC r251349:

Fix a typo: XPORT_SPI should be tested against transport, nor protocol.

Submitted by:	Sascha Wildner <swildner dragonflybsd org>
Reviewed by:	mjacob
Fix typos in the last revision.  Thanks to Andrey Chernov for his kind
patience.

Obtained from:	Netflix