aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLuis Carlos Cobo <luisca@cozybit.com>2007-08-02 13:15:40 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:50:11 -0400
commitb37e5842f5ab66f8d0533ee62ffe35c26ae800a3 (patch)
tree5d8fb2c7957d83902d989ef9d4df0a60561ddf9a /drivers
parent00af0157e0a603e2a2ce0896179f2dd43f0f28ab (diff)
[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')
-rw-r--r--drivers/net/wireless/libertas/join.c4
-rw-r--r--drivers/net/wireless/libertas/types.h2
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 @@
20/* Supported rates for ad-hoc B mode */ 20/* Supported rates for ad-hoc B mode */
21static u8 adhoc_rates_b[5] = { 0x02, 0x04, 0x0b, 0x16, 0x00 }; 21static u8 adhoc_rates_b[5] = { 0x02, 0x04, 0x0b, 0x16, 0x00 };
22 22
23/* The firmware needs certain bits masked out of the beacon-derviced capability
24 * field when associating/joining to BSSs.
25 */
26#define CAPINFO_MASK (~(0xda00))
23 27
24/** 28/**
25 * @brief This function finds common rates between rate1 and card rates. 29 * @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 @@
7#include <linux/if_ether.h> 7#include <linux/if_ether.h>
8#include <asm/byteorder.h> 8#include <asm/byteorder.h>
9 9
10#define CAPINFO_MASK (~(0x00da))
11
12struct ieeetypes_cfparamset { 10struct ieeetypes_cfparamset {
13 u8 elementid; 11 u8 elementid;
14 u8 len; 12 u8 len;