From patchwork Thu Jun 23 20:49:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Hockey X-Patchwork-Id: 913852 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5NKnRrO002978 for ; Thu, 23 Jun 2011 20:49:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933735Ab1FWUtZ (ORCPT ); Thu, 23 Jun 2011 16:49:25 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:48992 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933753Ab1FWUtY (ORCPT ); Thu, 23 Jun 2011 16:49:24 -0400 Received: by fxm17 with SMTP id 17so1499758fxm.19 for ; Thu, 23 Jun 2011 13:49:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to:cc :content-type; bh=u5X4m8VVyo5/hJ8MVLtPbXFAk1G6iPitJMiPss6PxQ8=; b=UMvT2Yub6wa2C25ChllIgjm0gGqohdjw1C3LYEvo6kn7/9OntZlBoUjt6OW7SPta7e cf+21lH//EzUKtzmQVHz714cFqfqYh811mK37e/dAdX3/3wbCS8I8TK8vOYOQRP3WmEo vZHJIkDIOxPc9LOD7Texi6BstJK+IDLNwwG84= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=B9V+0oy4V1ZJW40VyTNWFTnrmaj++kVFyaYlr8fWghMhxFT4ge6l7YR5kgbAwrL+s+ XeaJfEWhPkhljXk4nOAq1yxrsggsbFB4JvgTAYzLNrwViy7sYIdXFC8bosP7wJBOWggQ 4IpdvqBn96GxnzIEZbXG2lDftlCgtdUvRxPNY= MIME-Version: 1.0 Received: by 10.223.87.3 with SMTP id u3mr3309560fal.13.1308862163114; Thu, 23 Jun 2011 13:49:23 -0700 (PDT) Received: by 10.223.87.11 with HTTP; Thu, 23 Jun 2011 13:49:23 -0700 (PDT) Date: Thu, 23 Jun 2011 16:49:23 -0400 Message-ID: Subject: [PATCH] chan.c: fix chan.c to return channel number when in monitor mode and on a fixed channel. From: Nicholas Hockey To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org 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.6 (demeter2.kernel.org [140.211.167.43]); Thu, 23 Jun 2011 20:49:27 +0000 (UTC) (sorry if this is not right, its been nearly 10 years since i submitted a kernel patch) Fixes: When monitoring a fixed channel, chan.c does not report what channel it is on. Signed-off-by: Nicholas Hockey --- @@ -131,5 +133,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, if (wdev) wdev->channel = chan; + if (mon_dev) + mon_dev->channel = chan; + return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 17cd0c0..261ee32 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -82,10 +82,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, { struct ieee80211_channel *chan; int result; + struct wireless_dev *mon_dev = NULL; - if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR) + if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR) { + mon_dev = wdev; wdev = NULL; - + } if (wdev) { ASSERT_WDEV_LOCK(wdev);