From patchwork Mon Mar 25 15:26:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 2331911 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 7037B3FD8C for ; Mon, 25 Mar 2013 15:30:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758256Ab3CYPa3 (ORCPT ); Mon, 25 Mar 2013 11:30:29 -0400 Received: from mail-ee0-f47.google.com ([74.125.83.47]:36977 "EHLO mail-ee0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758038Ab3CYPa0 (ORCPT ); Mon, 25 Mar 2013 11:30:26 -0400 Received: by mail-ee0-f47.google.com with SMTP id t10so302666eei.34 for ; Mon, 25 Mar 2013 08:30:25 -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=p1cUL1OoI3D2J+Q1UqBp3cEPlWIzIup5Vp3mnE3npXg=; b=yhLLQpiFb/YCwD3PVhkeI3mQkOuHP92PwOD+Me0nzfP6YTPR3UBOENYvEwtbLSpCTl 6lfB+AJTYLmUmF6Nikc9joYuivVPStvFYPtr8tHUmNCm6p4v4Z7PEiEKdXgQXsXwVD1f YAyMc+YpLwaVL4Yw+HosIO8+xd78ESJNemfXkoh5VNQsTmtc12sIsqkZAHmRudDFQB4n wv77sR2Q1XSrBq7kDV6voNDJDuqgfE0Vr/lLozPoa8bt2UrgBSWwI2H7OR4n57TVeP/E /cELSZF5RiUtM5Cyu7B9pNnq9xUtcnoJuM7nLU/1Ad0XmszwN/HGEIFban0ePfkTS3Fl lWhw== X-Received: by 10.15.36.135 with SMTP id i7mr14572647eev.34.1364225425307; Mon, 25 Mar 2013 08:30:25 -0700 (PDT) Received: from magnum.frso.rivierawaves.com (vpn.rivierawaves.com. [91.151.119.162]) by mx.google.com with ESMTPS id bc1sm8337430eeb.11.2013.03.25.08.30.23 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Mar 2013 08:30:24 -0700 (PDT) From: Karl Beldan To: Johannes Berg Cc: linux-wireless , Karl Beldan , Karl Beldan Subject: [PATCH 2/3] Let drivers not supporting channel contexts use VHT Date: Mon, 25 Mar 2013 16:26:58 +0100 Message-Id: <1364225219-18473-3-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.7.10.GIT In-Reply-To: <1364225219-18473-1-git-send-email-karl.beldan@gmail.com> References: <1364225219-18473-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 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;