From patchwork Fri Mar 22 15:48:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 2321511 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id EB54BE00DD for ; Fri, 22 Mar 2013 15:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933715Ab3CVPvt (ORCPT ); Fri, 22 Mar 2013 11:51:49 -0400 Received: from mail-ee0-f53.google.com ([74.125.83.53]:55892 "EHLO mail-ee0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933746Ab3CVPvr (ORCPT ); Fri, 22 Mar 2013 11:51:47 -0400 Received: by mail-ee0-f53.google.com with SMTP id e53so2280214eek.12 for ; Fri, 22 Mar 2013 08:51:46 -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=U0bvPElGJbAGHbLdOpaIVoP3uvYPYqUzOGPdSFOtAI4=; b=pr9KvV6N+V/+Jy94WHPcQ4M1bb1GklkS/8Tl51sF33fLStJYheLlrEWeoi8FDX4ace xgWjSH+b8NGbuecLZq3ACiXeonzZl3qVrNCNhu0q7oINJkscLD5QQT3E/jI5ovGvx4k+ 0zSCv6nFz36o34lQUszcc5BA7CxqYv40/WdNz4CISYJARU6k6TK45YqpCWosOSVoKKoY jlJmOw/Bz49Yc0mtVLn2F4GFnzwoIfMYg/7m+hs/5GxJV2Fqnn2032+YnD1fRRiatlSj IbwR3FFNkI9VQq6/kLopXxf3UINHWTPaySEUs8r6UCX3zJBn1o1kXiZq9U7CUKtoHRoL XEIw== X-Received: by 10.14.216.2 with SMTP id f2mr6273553eep.44.1363967506477; Fri, 22 Mar 2013 08:51:46 -0700 (PDT) Received: from magnum.frso.rivierawaves.com (vpn.rivierawaves.com. [91.151.119.162]) by mx.google.com with ESMTPS id q42sm3727853eem.14.2013.03.22.08.51.45 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Mar 2013 08:51:45 -0700 (PDT) From: Karl Beldan To: Johannes Berg Cc: linux-wireless , Karl Beldan , Karl Beldan Subject: [RFC V3 2/2] mac80211: Let drivers not supporting channel contexts use VHT Date: Fri, 22 Mar 2013 16:48:24 +0100 Message-Id: <1363967304-4394-2-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.7.10.GIT In-Reply-To: <1363967304-4394-1-git-send-email-karl.beldan@gmail.com> References: <1363967304-4394-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 file changed, 1 insertion(+), 13 deletions(-) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index c71efbe..9d5b9c6 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;