Commit b37e5842 authored by Luis Carlos Cobo's avatar Luis Carlos Cobo Committed by David S. Miller

[PATCH] libertas: revert CAPINFO_MASK to its original value

CAPINFO_MASK changed on commits 981f187b and a091095b. Reverting to the original
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: default avatarLuis Carlos Cobo <luisca@cozybit.com>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 00af0157
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
/* Supported rates for ad-hoc B mode */ /* Supported rates for ad-hoc B mode */
static u8 adhoc_rates_b[5] = { 0x02, 0x04, 0x0b, 0x16, 0x00 }; 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. * @brief This function finds common rates between rate1 and card rates.
......
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#define CAPINFO_MASK (~(0x00da))
struct ieeetypes_cfparamset { struct ieeetypes_cfparamset {
u8 elementid; u8 elementid;
u8 len; u8 len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment