Commit:     b37e5842f5ab66f8d0533ee62ffe35c26ae800a3
Parent:     00af0157e0a603e2a2ce0896179f2dd43f0f28ab
Author:     Luis Carlos Cobo <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 13:15:40 2007 -0400
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:50:11 2007 -0700

    [PATCH] libertas: revert CAPINFO_MASK to its original value
    CAPINFO_MASK changed on commits 981f187b and a091095b. Reverting to the 
    value.  Also move CAPINFO_MASK into the sole user, join.c.  CAPINFO_MASK
    should be in host CPU byte order; capability is converted to device
    byte order elsewhere.
    This fixes OLPC ticket #2161
    Signed-off-by: Luis Carlos Cobo <[EMAIL PROTECTED]>
    Acked-by: Dan Williams <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
 drivers/net/wireless/libertas/join.c  |    4 ++++
 drivers/net/wireless/libertas/types.h |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/libertas/join.c 
index 0ebf2f8..ccb0df1 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/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/drivers/net/wireless/libertas/types.h 
index 2df352d..a43a5f6 100644
--- a/drivers/net/wireless/libertas/types.h
+++ b/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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to