diff --git a/[refs] b/[refs]
index be9d20a4e5ba..01e378b0415e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00af0157e0a603e2a2ce0896179f2dd43f0f28ab
+refs/heads/master: b37e5842f5ab66f8d0533ee62ffe35c26ae800a3
diff --git a/trunk/drivers/net/wireless/libertas/join.c b/trunk/drivers/net/wireless/libertas/join.c
index 0ebf2f8acbf1..ccb0df1967fb 100644
--- a/trunk/drivers/net/wireless/libertas/join.c
+++ b/trunk/drivers/net/wireless/libertas/join.c
@@ -20,6 +20,10 @@
 /* Supported rates for ad-hoc B mode */
 static u8 adhoc_rates_b[5] = { 0x02, 0x04, 0x0b, 0x16, 0x00 };
 
+/* The firmware needs certain bits masked out of the beacon-derviced capability
+ * field when associating/joining to BSSs.
+ */
+#define CAPINFO_MASK	(~(0xda00))
 
 /**
  *  @brief This function finds common rates between rate1 and card rates.
diff --git a/trunk/drivers/net/wireless/libertas/types.h b/trunk/drivers/net/wireless/libertas/types.h
index 2df352db1557..a43a5f63c879 100644
--- a/trunk/drivers/net/wireless/libertas/types.h
+++ b/trunk/drivers/net/wireless/libertas/types.h
@@ -7,8 +7,6 @@
 #include <linux/if_ether.h>
 #include <asm/byteorder.h>
 
-#define CAPINFO_MASK	(~(0x00da))
-
 struct ieeetypes_cfparamset {
 	u8 elementid;
 	u8 len;