diff options
| author | Luis Carlos Cobo <luisca@cozybit.com> | 2007-08-02 13:15:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:50:11 -0700 |
| commit | b37e5842f5ab66f8d0533ee62ffe35c26ae800a3 (patch) | |
| tree | 5d8fb2c7957d83902d989ef9d4df0a60561ddf9a /drivers/net | |
| parent | 00af0157e0a603e2a2ce0896179f2dd43f0f28ab (diff) | |
| download | blackbird-op-linux-b37e5842f5ab66f8d0533ee62ffe35c26ae800a3.tar.gz blackbird-op-linux-b37e5842f5ab66f8d0533ee62ffe35c26ae800a3.zip | |
[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: Luis Carlos Cobo <luisca@cozybit.com>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/libertas/join.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/types.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c index 0ebf2f8acbf1..ccb0df1967fb 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 b/drivers/net/wireless/libertas/types.h index 2df352db1557..a43a5f63c879 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; |
