diff mbox

[1/2] zd1211rw: Experimental change to add proper monitor support

Message ID 1266190499-2387-1-git-send-email-benoit.papillault@free.fr (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Benoit PAPILLAULT Feb. 14, 2010, 11:34 p.m. UTC
None
diff mbox

Patch

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 2d555cc..9cb6cbc 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -904,8 +904,26 @@  static int zd_op_config(struct ieee80211_hw *hw, u32 changed)
 {
 	struct zd_mac *mac = zd_hw_mac(hw);
 	struct ieee80211_conf *conf = &hw->conf;
+	int ret;
 
-	return zd_chip_set_channel(&mac->chip, conf->channel->hw_value);
+	if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
+		/*
+		 * Warning : enabling this register kills RX & TX
+		 * performance
+		 */
+		u32 cr_sniffer = !!(conf->flags & IEEE80211_CONF_MONITOR);
+		ret = zd_iowrite32(&mac->chip, CR_SNIFFER_ON, cr_sniffer);
+		if (!ret)
+			return ret;
+	}
+
+	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+		ret = zd_chip_set_channel(&mac->chip, conf->channel->hw_value);
+		if (!ret)
+			return ret;
+	}
+
+	return 0;
 }
 
 static void zd_process_intr(struct work_struct *work)