From patchwork Tue Mar 11 13:05:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Lisovy X-Patchwork-Id: 3812391 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CCBBDBF540 for ; Tue, 11 Mar 2014 13:06:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00369202A1 for ; Tue, 11 Mar 2014 13:06:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 538AB20221 for ; Tue, 11 Mar 2014 13:06:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754941AbaCKNFi (ORCPT ); Tue, 11 Mar 2014 09:05:38 -0400 Received: from mail-ea0-f173.google.com ([209.85.215.173]:34156 "EHLO mail-ea0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754618AbaCKNFe (ORCPT ); Tue, 11 Mar 2014 09:05:34 -0400 Received: by mail-ea0-f173.google.com with SMTP id r15so4252644ead.18 for ; Tue, 11 Mar 2014 06:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r4fYnoxKBOEpA+61JBL8y8NL2xtp3oHmYPf6kNDOUHk=; b=Dp2akaOkaEPT7ox54f/BYTtqC1TwH06g+q6TLjW3pEXMnpXAkETTlAK/6HxkXbbEje L/9QF+11htj+l2tt+VbwDUdzVlyV/C5WtIlGRgY9S8vQt5vRo8kj2MTlIrK/bhp2KHDr vETmgAJDb6cb6EsPMleJXET1lBNdn6xG5rMumGYUpu+a2KhrO9hiqseZFmA/m/wNSI45 6OYdCHzHA9IHU+vsQZZqTMwn8724sqncjKccgMW6z4CKg9j94/JhmTwO36Mfm8HWgmam r7ZBmjr0WPCb8rwIUAJcv0l5Ob/0O44sgl2NMW6Qg676Pu62Gnl11nkPLElooJWj1w5h UyXw== X-Received: by 10.15.65.68 with SMTP id p44mr3604073eex.63.1394543132700; Tue, 11 Mar 2014 06:05:32 -0700 (PDT) Received: from c2c-vostro1.felk.cvut.cz ([147.32.86.166]) by mx.google.com with ESMTPSA id o5sm57343965eeg.8.2014.03.11.06.05.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Mar 2014 06:05:31 -0700 (PDT) From: Rostislav Lisovy To: Johannes Berg , "John W. Linville" , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Michal Sojka , s.sander@nordsys.de, jan-niklas.meier@volkswagen.de, Rostislav Lisovy Subject: [PATCH 4/5] cfg80211: Use 5MHz bandwidth by default when checking usable channels Date: Tue, 11 Mar 2014 14:05:13 +0100 Message-Id: <1394543114-6700-5-git-send-email-rostislav.lisovy@fel.cvut.cz> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1394543114-6700-1-git-send-email-rostislav.lisovy@fel.cvut.cz> References: <1394543114-6700-1-git-send-email-rostislav.lisovy@fel.cvut.cz> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Current code checks if the 20MHz BW is allowed for particular channel -- if it is not, the channel is disabled. Since we need to use 5/10 MHz channels, this code is modified in the way that the default BW to check is 5MHz. If 5MHz is greater than the maximum bandwidth allowed by the channel, the channel is disabled. Otherwise the channel is used and the flags are set according to the BW allowed by the channel. Signed-off-by: Rostislav Lisovy --- net/wireless/reg.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index f054137..5f0dd26 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -805,7 +805,7 @@ freq_reg_info_regd(struct wiphy *wiphy, u32 center_freq, if (!band_rule_found) band_rule_found = freq_in_rule_band(fr, center_freq); - bw_fits = reg_does_bw_fit(fr, center_freq, MHZ_TO_KHZ(20)); + bw_fits = reg_does_bw_fit(fr, center_freq, MHZ_TO_KHZ(5)); if (band_rule_found && bw_fits) return rr; @@ -888,10 +888,10 @@ static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan, } #endif -/* - * Note that right now we assume the desired channel bandwidth - * is always 20 MHz for each individual channel (HT40 uses 20 MHz - * per channel, the primary and the extension channel). +/* Find an ieee80211_reg_rule such that a 5MHz channel with frequency + * @chan->center_freq fits there. + * If there is no such reg_rule, disable the channel, otherwise set the + * flags corresponding to the bandwidths allowed in the particular reg_rule */ static void handle_channel(struct wiphy *wiphy, enum nl80211_reg_initiator initiator, @@ -944,8 +944,12 @@ static void handle_channel(struct wiphy *wiphy, power_rule = ®_rule->power_rule; freq_range = ®_rule->freq_range; + if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(10)) + bw_flags = IEEE80211_CHAN_NO_10MHZ; + if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(20)) + bw_flags |= IEEE80211_CHAN_NO_20MHZ; if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(40)) - bw_flags = IEEE80211_CHAN_NO_HT40; + bw_flags |= IEEE80211_CHAN_NO_HT40; if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(80)) bw_flags |= IEEE80211_CHAN_NO_80MHZ; if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(160)) @@ -1351,8 +1355,12 @@ static void handle_channel_custom(struct wiphy *wiphy, power_rule = ®_rule->power_rule; freq_range = ®_rule->freq_range; + if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(10)) + bw_flags = IEEE80211_CHAN_NO_10MHZ; + if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(20)) + bw_flags |= IEEE80211_CHAN_NO_20MHZ; if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(40)) - bw_flags = IEEE80211_CHAN_NO_HT40; + bw_flags |= IEEE80211_CHAN_NO_HT40; if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(80)) bw_flags |= IEEE80211_CHAN_NO_80MHZ; if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(160))