From patchwork Fri Mar 7 13:37:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Lisovy X-Patchwork-Id: 3791571 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 3E454BF540 for ; Fri, 7 Mar 2014 13:38:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2777A20265 for ; Fri, 7 Mar 2014 13:38:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 109F5202C8 for ; Fri, 7 Mar 2014 13:38:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753515AbaCGNiU (ORCPT ); Fri, 7 Mar 2014 08:38:20 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:40567 "EHLO mail-ea0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753456AbaCGNiQ (ORCPT ); Fri, 7 Mar 2014 08:38:16 -0500 Received: by mail-ea0-f173.google.com with SMTP id r15so2299519ead.18 for ; Fri, 07 Mar 2014 05:38:15 -0800 (PST) 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=EJrkrV9U3Ut46u8uf9bqm5ibTgjYCcwnFwjz+BGakTE=; b=y7MNR6sENl8Hru2lB0P8WVcnNBoPAmSsoPQE+tpQqZcvbv/zGTdRCu62zq9PYv1J6q 2BvwWBOhBSRQlUw9diGoFKBYF4MWQvWzmeyaff48w+dE138ddKWGcIMNyzSIkYdrX23Z YFFUz+hJaS91Oy+amDB0bJ4DEumVURUBTfKvf0MR7zqqY0AaUqKGnI0phl65kNUGXddT TsSDGXW73UN5DfHWlftCdhOyGDLiyFOWpOPH3kxd6e9YSyKjHX2/hWZzxbYU00W4F9kr YGb7tDuXIDd3zTZiJlTG3xfB5puLHg3S2ZizPUVUfuKSDcb3zM7pjClIodiUxA1F1ots NjHw== X-Received: by 10.14.184.72 with SMTP id r48mr19018786eem.27.1394199495381; Fri, 07 Mar 2014 05:38:15 -0800 (PST) Received: from c2c-vostro1.felk.cvut.cz ([147.32.86.166]) by mx.google.com with ESMTPSA id 48sm6764355eee.2.2014.03.07.05.38.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Mar 2014 05:38:14 -0800 (PST) From: Rostislav Lisovy To: Johannes Berg , linux-wireless@vger.kernel.org Cc: Michal Sojka , s.sander@nordsys.de, jan-niklas.meier@volkswagen.de Subject: [RFC PATCH 8/8] mac80211: Update conf_is_ht() to work properly with 5/10MHz channels Date: Fri, 7 Mar 2014 14:37:55 +0100 Message-Id: <1394199475-5208-9-git-send-email-rostislav.lisovy@fel.cvut.cz> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1394199475-5208-1-git-send-email-rostislav.lisovy@fel.cvut.cz> References: <1394199475-5208-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=ham 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 Signed-off-by: Rostislav Lisovy --- include/net/mac80211.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index f4ab2fb..f56e45b 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -4585,7 +4585,9 @@ conf_is_ht40(struct ieee80211_conf *conf) static inline bool conf_is_ht(struct ieee80211_conf *conf) { - return conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT; + return (conf->chandef.width != NL80211_CHAN_WIDTH_5) && + (conf->chandef.width != NL80211_CHAN_WIDTH_10) && + (conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT); } static inline enum nl80211_iftype