aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2006-08-01 17:43:31 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-08-02 14:26:50 -0400
commit71eae25ece9ee6bc2fe9500c9c06bfbb46c55fb2 (patch)
tree85018848605fbc8a8ad5124bed5491a88c1d342a /drivers/net
parent99f65f25c19a7a8a5789c300c2a575cff3453382 (diff)
[PATCH] zd1211rw: Pass more management frame types up to host
We'll be needing these at some point... Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Ulrich Kunitz <kune@deine-taler.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_chip.h4
-rw-r--r--drivers/net/wireless/zd1211rw/zd_mac.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index 805121093ab5..0eb9c8facbd3 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -461,10 +461,12 @@
461 461
462#define CR_RX_FILTER CTL_REG(0x068c) 462#define CR_RX_FILTER CTL_REG(0x068c)
463#define RX_FILTER_ASSOC_RESPONSE 0x0002 463#define RX_FILTER_ASSOC_RESPONSE 0x0002
464#define RX_FILTER_REASSOC_RESPONSE 0x0008
464#define RX_FILTER_PROBE_RESPONSE 0x0020 465#define RX_FILTER_PROBE_RESPONSE 0x0020
465#define RX_FILTER_BEACON 0x0100 466#define RX_FILTER_BEACON 0x0100
467#define RX_FILTER_DISASSOC 0x0400
466#define RX_FILTER_AUTH 0x0800 468#define RX_FILTER_AUTH 0x0800
467/* Sniff modus sets filter to 0xfffff */ 469/* Monitor mode sets filter to 0xfffff */
468 470
469#define CR_ACK_TIMEOUT_EXT CTL_REG(0x0690) 471#define CR_ACK_TIMEOUT_EXT CTL_REG(0x0690)
470#define CR_BCN_FIFO_SEMAPHORE CTL_REG(0x0694) 472#define CR_BCN_FIFO_SEMAPHORE CTL_REG(0x0694)
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index b3943038ff83..1cf1fdab3c05 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -136,8 +136,10 @@ static int reset_mode(struct zd_mac *mac)
136{ 136{
137 struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); 137 struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
138 struct zd_ioreq32 ioreqs[3] = { 138 struct zd_ioreq32 ioreqs[3] = {
139 { CR_RX_FILTER, RX_FILTER_BEACON|RX_FILTER_PROBE_RESPONSE| 139 { CR_RX_FILTER, RX_FILTER_BEACON | RX_FILTER_PROBE_RESPONSE |
140 RX_FILTER_AUTH|RX_FILTER_ASSOC_RESPONSE }, 140 RX_FILTER_AUTH | RX_FILTER_ASSOC_RESPONSE |
141 RX_FILTER_REASSOC_RESPONSE |
142 RX_FILTER_DISASSOC },
141 { CR_SNIFFER_ON, 0U }, 143 { CR_SNIFFER_ON, 0U },
142 { CR_ENCRYPTION_TYPE, NO_WEP }, 144 { CR_ENCRYPTION_TYPE, NO_WEP },
143 }; 145 };