diff options
| author | Daniel Drake <dsd@gentoo.org> | 2006-08-01 23:43:32 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:26:50 -0400 |
| commit | 40da08bca6f4e7dec4a75c3c47800e5f4ca4e567 (patch) | |
| tree | 14d38e34d68247622ed42a0fc8682de749062b50 /drivers | |
| parent | 71eae25ece9ee6bc2fe9500c9c06bfbb46c55fb2 (diff) | |
| download | talos-obmc-linux-40da08bca6f4e7dec4a75c3c47800e5f4ca4e567.tar.gz talos-obmc-linux-40da08bca6f4e7dec4a75c3c47800e5f4ca4e567.zip | |
[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')
| -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) if (r) goto disable_int; - r = zd_set_encryption_type(chip, NO_WEP); + /* We must inform the device that we are doing encryption/decryption in + * software at the moment. */ + r = zd_set_encryption_type(chip, ENC_SNIFFER); if (r) goto disable_int; @@ -141,7 +143,6 @@ static int reset_mode(struct zd_mac *mac) RX_FILTER_REASSOC_RESPONSE | RX_FILTER_DISASSOC }, { CR_SNIFFER_ON, 0U }, - { CR_ENCRYPTION_TYPE, NO_WEP }, }; if (ieee->iw_mode == IW_MODE_MONITOR) { |
