From patchwork Sun Feb 14 23:34:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit PAPILLAULT X-Patchwork-Id: 79335 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1ENZLvY031730 for ; Sun, 14 Feb 2010 23:35:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753516Ab0BNXfL (ORCPT ); Sun, 14 Feb 2010 18:35:11 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:55364 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753510Ab0BNXfJ (ORCPT ); Sun, 14 Feb 2010 18:35:09 -0500 Received: from smtp1-g21.free.fr (localhost [127.0.0.1]) by smtp1-g21.free.fr (Postfix) with ESMTP id A0842940019; Mon, 15 Feb 2010 00:35:02 +0100 (CET) Received: from xian.sabine-et-benoit.com (ns.popipo.fr [88.163.232.53]) by smtp1-g21.free.fr (Postfix) with ESMTP id BCCCF940045; Mon, 15 Feb 2010 00:34:59 +0100 (CET) Received: by xian.sabine-et-benoit.com (Postfix, from userid 1000) id 9BF93701A8; Mon, 15 Feb 2010 00:34:59 +0100 (CET) From: Benoit Papillault To: dsd@gentoo.org, kune@deine-taler.de Cc: linux-wireless@vger.kernel.org, zd1211-devs@lists.sourceforge.net, Benoit Papillault Subject: [PATCH 1/2] zd1211rw: Experimental change to add proper monitor support Date: Mon, 15 Feb 2010 00:34:58 +0100 Message-Id: <1266190499-2387-1-git-send-email-benoit.papillault@free.fr> X-Mailer: git-send-email 1.5.6.5 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 14 Feb 2010 23:35:21 +0000 (UTC) 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)