From patchwork Tue Mar 19 00:23:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 2297621 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 982C43FD8C for ; Tue, 19 Mar 2013 00:23:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932824Ab3CSAXi (ORCPT ); Mon, 18 Mar 2013 20:23:38 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:44900 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757125Ab3CSAXg (ORCPT ); Mon, 18 Mar 2013 20:23:36 -0400 Received: by mail-wi0-f179.google.com with SMTP id ez12so3265646wid.6 for ; Mon, 18 Mar 2013 17:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=TJ7NEtkFjcYG+wMR+w9Yv+za2dKmvIPI1F65LV6Tbw8=; b=wgaCfPpZyZGNFwybV294OYbxp0g2RsZjXRMKi/MJr2FoRs9Cq19W0nSaH82UdfmgmM G56Ujv2g9SLsxOzwzFeJoy/kyAMN5y7Ax1gVSSUZm0xnuEdCK29KFfht692a/SVccaIg f8AXmNMgoc86enkH/mYPPghlDhu6oqiqZuZFnzmDUOfCFdA1eNjPvCuFky6f/vxXujlA +vA0aHr3vk/nKiGt3X0DuFo88iUBKCUoTnkMx7srEazfRS6XKeXpZnHwpNdQrAFkejCJ yC3cqsVjH/ZhJugWt7Hh54+kzrKWyDmjti0Q1poOOeD1d5ZB22vBUN/Sg0OUOExZLiFy o6pQ== X-Received: by 10.194.119.33 with SMTP id kr1mr28156524wjb.36.1363652615393; Mon, 18 Mar 2013 17:23:35 -0700 (PDT) Received: from localhost.localdomain (ppp-seco11pa2-46-193-135.194.wb.wifirst.net. [46.193.135.194]) by mx.google.com with ESMTPS id h10sm18144829wic.8.2013.03.18.17.23.34 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Mar 2013 17:23:34 -0700 (PDT) From: Karl Beldan To: Johannes Berg , Karl Beldan Cc: linux-wireless , Karl Beldan Subject: [RFC V2 2/2] mac80211: Let drivers not supporting channel contexts use VHT Date: Tue, 19 Mar 2013 01:23:20 +0100 Message-Id: <1363652600-23223-3-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.7.9.dirty In-Reply-To: <1363652600-23223-1-git-send-email-karl.beldan@gmail.com> References: <1363652600-23223-1-git-send-email-karl.beldan@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Karl Beldan It is possible since the global hw config and local switched to cfg80211_chan_def. Signed-off-by: Karl Beldan --- net/mac80211/main.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 1da8ce0..e97f85a 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -838,22 +838,10 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) if (supp_ht) local->scan_ies_len += 2 + sizeof(struct ieee80211_ht_cap); - if (supp_vht) { + if (supp_vht) local->scan_ies_len += 2 + sizeof(struct ieee80211_vht_cap); - /* - * (for now at least), drivers wanting to use VHT must - * support channel contexts, as they contain all the - * necessary VHT information and the global hw config - * doesn't (yet) - */ - if (WARN_ON(!local->use_chanctx)) { - result = -EINVAL; - goto fail_wiphy_register; - } - } - if (!local->ops->hw_scan) { /* For hw_scan, driver needs to set these up. */ local->hw.wiphy->max_scan_ssids = 4;