From patchwork Sun Mar 24 22:17:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 2327311 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 303AB3FC54 for ; Sun, 24 Mar 2013 22:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754880Ab3CXWSM (ORCPT ); Sun, 24 Mar 2013 18:18:12 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:64136 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754812Ab3CXWSK (ORCPT ); Sun, 24 Mar 2013 18:18:10 -0400 Received: by mail-wg0-f51.google.com with SMTP id 8so4407372wgl.6 for ; Sun, 24 Mar 2013 15:18:09 -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=QneF5OPHVEAMhF4K6UQlFtshF7JpbbpSNZvC8sg5444=; b=FrVFrDY5+8VQ2ohA8EKa/IFJR4sUiDqlPqs8ncGluhEieSvaxMpU2KX6DVvFUgME/i ooHGx+bOLiQ+gIxmjHzOClAx0fkabkKCvDUSTVN2ezcYV3Uf2FTr7iBZesI1+ZYFxFSd nd1OBdHEXSru9dRhuUQzsY+QU7u0J73wZSzSbO039PqxeckPwnJykbfWiHQ3RTvEOBX6 iq7dmjq5oq+QDzFu98QWz5NDaQqncJ81B3e9I5o3v608OcUUqrPmc71fEgkGNvP3tx3L 2s+OdAuwsugenFhlKwWrDNhxbzbV1cRL3HLTCANO6Z22vnH6l9u5SOW2fLvUGISe9zGK z7vw== X-Received: by 10.180.105.99 with SMTP id gl3mr13856693wib.22.1364163489299; Sun, 24 Mar 2013 15:18:09 -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 g9sm9822029wix.1.2013.03.24.15.18.07 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 24 Mar 2013 15:18:08 -0700 (PDT) From: Karl Beldan To: Johannes Berg , Karl Beldan Cc: linux-wireless , Karl Beldan Subject: [RFC V4 2/3] mac80211: Let drivers not supporting channel contexts use VHT Date: Sun, 24 Mar 2013 23:17:42 +0100 Message-Id: <1364163463-16372-3-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.7.9.dirty In-Reply-To: <1364163463-16372-1-git-send-email-karl.beldan@gmail.com> References: <1364163463-16372-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 25a87f4..4b2e654 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;