---

yaml --- r: 66491 b: refs/heads/master c: b37e584 h: refs/heads/master i: 66489: 8e127e5 66487: d6d88cb v: v3
git-mirror · Oct 10, 2007 · 8915c18 · 8915c18
1 parent 80ed0cb
commit 8915c18
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -7,8 +7,6 @@
 #include <linux/if_ether.h>
 #include <asm/byteorder.h>
 
-#define CAPINFO_MASK	(~(0x00da))
-
 struct ieeetypes_cfparamset {
 	u8 elementid;
 	u8 len;