aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2010-02-18 06:25:52 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-02-19 15:52:46 -0500
commit1937e742639c03a6fe77239c3003ce9602302117 (patch)
treebc315dfe6cf01b29e495c576d1b5b7fa69d8134b
parent8bf29b0eb3ba38c8cf55e60976f124672cda7ab2 (diff)
wl1271: Fix beacon filter table configuration
The beacon filter table configuration ACX structure had certain elements reversed, resulting in firmware instability in regard of the feature. Fix the structure. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Reviewed-by: Kalle Valo <kalle.valo@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_acx.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h
index ac94a13ea747..aeccc98581eb 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.h
@@ -2,7 +2,7 @@
2 * This file is part of wl1271 2 * This file is part of wl1271
3 * 3 *
4 * Copyright (C) 1998-2009 Texas Instruments. All rights reserved. 4 * Copyright (C) 1998-2009 Texas Instruments. All rights reserved.
5 * Copyright (C) 2008-2009 Nokia Corporation 5 * Copyright (C) 2008-2010 Nokia Corporation
6 * 6 *
7 * Contact: Luciano Coelho <luciano.coelho@nokia.com> 7 * Contact: Luciano Coelho <luciano.coelho@nokia.com>
8 * 8 *
@@ -348,7 +348,7 @@ struct acx_beacon_filter_option {
348 * ACXBeaconFilterEntry (not 221) 348 * ACXBeaconFilterEntry (not 221)
349 * Byte Offset Size (Bytes) Definition 349 * Byte Offset Size (Bytes) Definition
350 * =========== ============ ========== 350 * =========== ============ ==========
351 * 0 1 IE identifier 351 * 0 1 IE identifier
352 * 1 1 Treatment bit mask 352 * 1 1 Treatment bit mask
353 * 353 *
354 * ACXBeaconFilterEntry (221) 354 * ACXBeaconFilterEntry (221)
@@ -381,8 +381,8 @@ struct acx_beacon_filter_ie_table {
381 struct acx_header header; 381 struct acx_header header;
382 382
383 u8 num_ie; 383 u8 num_ie;
384 u8 table[BEACON_FILTER_TABLE_MAX_SIZE];
385 u8 pad[3]; 384 u8 pad[3];
385 u8 table[BEACON_FILTER_TABLE_MAX_SIZE];
386} __attribute__ ((packed)); 386} __attribute__ ((packed));
387 387
388struct acx_conn_monit_params { 388struct acx_conn_monit_params {