From patchwork Tue Jan 27 08:44:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz.Dziedzic@tieto.com X-Patchwork-Id: 5715641 X-Patchwork-Delegate: johannes@sipsolutions.net 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6B9C2C058D for ; Tue, 27 Jan 2015 08:45:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A18DC20142 for ; Tue, 27 Jan 2015 08:45:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1BCF0200E9 for ; Tue, 27 Jan 2015 08:45:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757551AbbA0IpS (ORCPT ); Tue, 27 Jan 2015 03:45:18 -0500 Received: from mail-we0-f177.google.com ([74.125.82.177]:50116 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754588AbbA0IpQ (ORCPT ); Tue, 27 Jan 2015 03:45:16 -0500 Received: by mail-we0-f177.google.com with SMTP id l61so13498166wev.8 for ; Tue, 27 Jan 2015 00:45:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=+UE2J35VlSjuAv91lDTc/pzxZNyU40wjGkqvh7zMG2A=; b=XmWPX4t4Iblrj8CvOmAk3ePxthRwcKZeYQpW4syR4MujCnoVyaXHJBoXj9UsUo1DTF cRy7SIPRqfu64sRDhgyFNh8jni6xsYIt6J9z+/CmI8Vh7DTpOM4OAvDQWFchkgl3AfNl 4CIqkQg/Wt99RkeU0KAG8dgwOZkAYY+D6DVX4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+UE2J35VlSjuAv91lDTc/pzxZNyU40wjGkqvh7zMG2A=; b=BWIBegFR78x4SHcGSBbTltclgslOz9+N5tltzbKIrNuwgGv5INJ8JkZFaq2ISew0wp ZZJoHp4TfLxfl3bXHJpDW4fl6DA7PQLnR9PkpFj/y8L6hgWzvgc+9aBP1bWX8qpWC0G1 btgBLpt12trA9Nlyxxb3esQn3dMroLejj/vHOBd2ViFmGK6MhN/a6o4RIhphMzUWJPe6 huj5jdxV6PgPdSWgpJmq9GfhXOkY+vlNODmbCRyDVsl7y8G1/TKKxRZQydI37pSWn97Q VFu5xJu8idDOEeJnddZtnpo1n296rhSOBB6k618lH/dg/eW26cdmizhgFiB6lNL5hGaJ VT7g== X-Gm-Message-State: ALoCoQmwaIipA5yu/TcAQs6y6MqKTjZIbOWU03FYWPsEoSMy8SzImBC/OmhJQ6OhXA80duZ3I7PvQOj9UaNMEMJVFDdt6mEhIJYJKOiA03s5LDjA+K7nOvzvVFJQsttO5Eej+P4Hp3Tx8+gvsPZ2JHRohE5kdjGFTZgBtmciyFRKlvEOBiSJF1N1MtW5Nl7tA/2ZwrIoFm8F X-Received: by 10.180.88.33 with SMTP id bd1mr4782827wib.10.1422348314506; Tue, 27 Jan 2015 00:45:14 -0800 (PST) Received: from localhost.localdomain (apn-31-1-134-151.dynamic.gprs.plus.pl. [31.1.134.151]) by mx.google.com with ESMTPSA id dc1sm17152714wib.18.2015.01.27.00.45.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Jan 2015 00:45:13 -0800 (PST) From: Janusz Dziedzic To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Janusz Dziedzic Subject: [RFCv4 1/3] cfg80211: add VHT support for IBSS Date: Tue, 27 Jan 2015 09:44:01 +0100 Message-Id: <1422348243-4928-1-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.9.1 X-DomainID: tieto.com 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_SIGNED, 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 Add NL80211_EXT_FEATURE_VHT_IBSS flag and VHT support for IBSS. Signed-off-by: Janusz Dziedzic --- include/uapi/linux/nl80211.h | 2 ++ net/wireless/nl80211.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 735ab43..ed491b2 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -4204,11 +4204,13 @@ enum nl80211_feature_flags { /** * enum nl80211_ext_feature_index - bit index of extended features. + * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates. * * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index. */ enum nl80211_ext_feature_index { + NL80211_EXT_FEATURE_VHT_IBSS, /* add new features before the definition below */ NUM_NL80211_EXT_FEATURES, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 39753de..a662cd1 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -7092,8 +7092,18 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) break; case NL80211_CHAN_WIDTH_20: case NL80211_CHAN_WIDTH_40: - if (rdev->wiphy.features & NL80211_FEATURE_HT_IBSS) - break; + if (!(rdev->wiphy.features & NL80211_FEATURE_HT_IBSS)) + return -EINVAL; + break; + case NL80211_CHAN_WIDTH_80: + case NL80211_CHAN_WIDTH_80P80: + case NL80211_CHAN_WIDTH_160: + if (!(rdev->wiphy.features & NL80211_FEATURE_HT_IBSS)) + return -EINVAL; + if (!wiphy_ext_feature_isset(&rdev->wiphy, + NL80211_EXT_FEATURE_VHT_IBSS)) + return -EINVAL; + break; default: return -EINVAL; }