From patchwork Fri Nov 26 12:43:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luciano Coelho X-Patchwork-Id: 358542 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAQChHHS030290 for ; Fri, 26 Nov 2010 12:43:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753743Ab0KZMnI (ORCPT ); Fri, 26 Nov 2010 07:43:08 -0500 Received: from smtp.nokia.com ([147.243.1.47]:37867 "EHLO mgw-sa01.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751406Ab0KZMnH (ORCPT ); Fri, 26 Nov 2010 07:43:07 -0500 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa01.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id oAQCh4dp005785 for ; Fri, 26 Nov 2010 14:43:05 +0200 Received: from localhost.localdomain ([esdhcp040213.research.nokia.com [172.21.40.213]]) by mgw-sa01.nokia.com with RELAY id oAQCgl24005335 ; Fri, 26 Nov 2010 14:42:47 +0200 From: luciano.coelho@nokia.com To: linux-wireless@vger.kernel.org Cc: Luciano Coelho , Juuso Oikarinen Subject: [PATCH] wl12xx: disable 11a channels when regulatory changes if 11a is not supported Date: Fri, 26 Nov 2010 14:43:10 +0200 Message-Id: <1290775390-3391-1-git-send-email-luciano.coelho@nokia.com> X-Mailer: git-send-email 1.7.0.4 X-Nokia-AV: Clean 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 (demeter1.kernel.org [140.211.167.41]); Fri, 26 Nov 2010 12:43:18 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 35cfcf6..97eb186 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -336,7 +336,9 @@ out: } static int wl1271_reg_notify(struct wiphy *wiphy, - struct regulatory_request *request) { + struct regulatory_request *request) +{ + struct wl1271 *wl = wiphy_to_ieee80211_hw(wiphy)->priv; struct ieee80211_supported_band *band; struct ieee80211_channel *ch; int i; @@ -347,6 +349,11 @@ static int wl1271_reg_notify(struct wiphy *wiphy, if (ch->flags & IEEE80211_CHAN_DISABLED) continue; + if (!wl->enable_11a) { + ch->flags |= IEEE80211_CHAN_DISABLED; + continue; + } + if (ch->flags & IEEE80211_CHAN_RADAR) ch->flags |= IEEE80211_CHAN_NO_IBSS | IEEE80211_CHAN_PASSIVE_SCAN;