From 2ac90279d803568fb04877b0c9f96873d7867f06 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@gentoo.org>
Date: Tue, 1 Aug 2006 23:43:32 +0200
Subject: [PATCH] --- yaml --- r: 33140 b: refs/heads/master c:
 40da08bca6f4e7dec4a75c3c47800e5f4ca4e567 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/zd1211rw/zd_mac.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index eebcaefd153b..560a1cc679fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71eae25ece9ee6bc2fe9500c9c06bfbb46c55fb2
+refs/heads/master: 40da08bca6f4e7dec4a75c3c47800e5f4ca4e567
diff --git a/trunk/drivers/net/wireless/zd1211rw/zd_mac.c b/trunk/drivers/net/wireless/zd1211rw/zd_mac.c
index 1cf1fdab3c05..a66625c43487 100644
--- a/trunk/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/trunk/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) {