Index: sys/compat/linuxkpi/common/include/net/mac80211.h
===================================================================
--- sys/compat/linuxkpi/common/include/net/mac80211.h
+++ sys/compat/linuxkpi/common/include/net/mac80211.h
@@ -99,7 +99,7 @@
 };
 
 /* 802.11 Figure 9-256 Suite selector format. [OUI(3), SUITE TYPE(1)] */
-#define	WLAN_CIPHER_SUITE_OUI(_oui, _x)	((_oui) << 8 | (_x) & 0xff)
+#define	WLAN_CIPHER_SUITE_OUI(_oui, _x)	(((_oui) << 8) | ((_x) & 0xff))
 
 /* 802.11 Table 9-131 Cipher suite selectors. */
 /* 802.1x suite B			11 */
Index: sys/compat/linuxkpi/common/src/linux_xarray.c
===================================================================
--- sys/compat/linuxkpi/common/src/linux_xarray.c
+++ sys/compat/linuxkpi/common/src/linux_xarray.c
@@ -103,7 +103,7 @@
 	XA_ASSERT_LOCKED(xa);
 
 	/* mask should allow to allocate at least one item */
-	MPASS(mask > (xa->flags & XA_FLAGS_ALLOC1) != 0 ? 1 : 0);
+	MPASS((mask > (xa->flags & XA_FLAGS_ALLOC1)) != 0 ? 1 : 0);
 
 	/* mask can be any power of two value minus one */
 	MPASS((mask & (mask + 1)) == 0);
@@ -160,7 +160,7 @@
 	XA_ASSERT_LOCKED(xa);
 
 	/* mask should allow to allocate at least one item */
-	MPASS(mask > (xa->flags & XA_FLAGS_ALLOC1) != 0 ? 1 : 0);
+	MPASS((mask > (xa->flags & XA_FLAGS_ALLOC1)) != 0 ? 1 : 0);
 
 	/* mask can be any power of two value minus one */
 	MPASS((mask & (mask + 1)) == 0);