aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/zd1211rw/zd_mac.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_mac.c')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_mac.c5
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) {