diff options
author | Daniel Drake <dsd@gentoo.org> | 2006-08-01 17:43:32 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:26:50 -0400 |
commit | 40da08bca6f4e7dec4a75c3c47800e5f4ca4e567 (patch) | |
tree | 14d38e34d68247622ed42a0fc8682de749062b50 /drivers/net/wireless/zd1211rw | |
parent | 71eae25ece9ee6bc2fe9500c9c06bfbb46c55fb2 (diff) |
[PATCH] zd1211rw: Fix software encryption/decryption
Apparently the ZD1211 doesn't mind, but the ZD1211B absolutely must be
told that encryption is happening in software.
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/wireless/zd1211rw')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 1cf1fdab3c05..a66625c43487 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -108,7 +108,9 @@ int zd_mac_init_hw(struct zd_mac *mac, u8 device_type) | |||
108 | if (r) | 108 | if (r) |
109 | goto disable_int; | 109 | goto disable_int; |
110 | 110 | ||
111 | r = zd_set_encryption_type(chip, NO_WEP); | 111 | /* We must inform the device that we are doing encryption/decryption in |
112 | * software at the moment. */ | ||
113 | r = zd_set_encryption_type(chip, ENC_SNIFFER); | ||
112 | if (r) | 114 | if (r) |
113 | goto disable_int; | 115 | goto disable_int; |
114 | 116 | ||
@@ -141,7 +143,6 @@ static int reset_mode(struct zd_mac *mac) | |||
141 | RX_FILTER_REASSOC_RESPONSE | | 143 | RX_FILTER_REASSOC_RESPONSE | |
142 | RX_FILTER_DISASSOC }, | 144 | RX_FILTER_DISASSOC }, |
143 | { CR_SNIFFER_ON, 0U }, | 145 | { CR_SNIFFER_ON, 0U }, |
144 | { CR_ENCRYPTION_TYPE, NO_WEP }, | ||
145 | }; | 146 | }; |
146 | 147 | ||
147 | if (ieee->iw_mode == IW_MODE_MONITOR) { | 148 | if (ieee->iw_mode == IW_MODE_MONITOR) { |