From patchwork Tue Mar 11 13:05:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Lisovy X-Patchwork-Id: 3812411 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9D3D19F402 for ; Tue, 11 Mar 2014 13:06:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C57F220221 for ; Tue, 11 Mar 2014 13:06:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50B8C2021C for ; Tue, 11 Mar 2014 13:06:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755115AbaCKNGH (ORCPT ); Tue, 11 Mar 2014 09:06:07 -0400 Received: from mail-ea0-f169.google.com ([209.85.215.169]:44010 "EHLO mail-ea0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754891AbaCKNFg (ORCPT ); Tue, 11 Mar 2014 09:05:36 -0400 Received: by mail-ea0-f169.google.com with SMTP id h14so4347441eaj.14 for ; Tue, 11 Mar 2014 06:05:35 -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=EJrkrV9U3Ut46u8uf9bqm5ibTgjYCcwnFwjz+BGakTE=; b=TXrtbPHwz0+tpJmBTzflz4mM+b7+T0nIo0y7bJlG+i/WNsu1ERXizJBjjhWbUxzUSl b//usbtssqxtysUAGkSSJSNPljIMUkqcxCdq5BMe6hpQPMdpJi2Dngp6tW0A2ArOSxYY L/QLNeEieyZY6bEJdHfVrYdZNY0KLSft69ruwVSKbvmWe2woxLLgiM3FwhZE5zFlLPAs gZHeA8YgtO4QK6LLDDILWwlPBdGn01AM7xf9ARnWgSnhADG+Qveh3tnMrrZWest5xgK7 EC/99DjxUer2KV9S2AGl6F5M18mq1jU+4AC3kxdbWkMUheqmQh0dNrqmgw8NiyW+dAnV 7rAw== X-Received: by 10.14.10.73 with SMTP id 49mr10549402eeu.52.1394543135062; Tue, 11 Mar 2014 06:05:35 -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.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Mar 2014 06:05:34 -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 5/5] mac80211: Update conf_is_ht() to work properly with 5/10MHz channels Date: Tue, 11 Mar 2014 14:05:14 +0100 Message-Id: <1394543114-6700-6-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=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