From patchwork Sun Mar 17 20:30:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 2284391 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 683D43FD8C for ; Sun, 17 Mar 2013 20:31:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756657Ab3CQUa6 (ORCPT ); Sun, 17 Mar 2013 16:30:58 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:48107 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756614Ab3CQUav (ORCPT ); Sun, 17 Mar 2013 16:30:51 -0400 Received: by mail-wg0-f46.google.com with SMTP id fg15so4338630wgb.1 for ; Sun, 17 Mar 2013 13:30:50 -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=czYjWHl0AjeMBVRUvrcRqVLfH8AZwy13aLOzzgmVmvs=; b=yLe4LtAAlDFJu+kCUd6iJW98rwSkllbSf93Rrchuyb6IX3us3QLlcJtZ7i9+Cj5Kdn B2WrZrNHlnK7OFqkAa8Ulja8uYHo8QWwYDO/JQLQVC269Nf49434nw2SUzbrNUnJOV5H FntTyBkPPIuOjmjH0MYSTE8FgyqpbejR1UJZhJMFM+VSGfyuJpKoItgZKnkTsgUyGH6C oOGX/sBuKGm9fol+MLkpP9q7iuhCecmErEEYlO3d8xgkURFHQMpJLvX/875gsync0EwH EENlznvYXA7DM4yxJjWldwzTqVs6O5bZET9MVL80dgBKvHExpII14ctr/qLsp8ISoXLP ioaQ== X-Received: by 10.180.105.229 with SMTP id gp5mr12765908wib.10.1363552250292; Sun, 17 Mar 2013 13:30:50 -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 ej8sm9877881wib.9.2013.03.17.13.30.48 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Mar 2013 13:30:49 -0700 (PDT) From: Karl Beldan To: Johannes Berg , Karl Beldan Cc: linux-wireless , Karl Beldan Subject: [RFC 2/2] mac80211: Let drivers not supporting channel contexts use VHT Date: Sun, 17 Mar 2013 21:30:34 +0100 Message-Id: <1363552234-6752-3-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.7.9.dirty In-Reply-To: <1363552234-6752-1-git-send-email-karl.beldan@gmail.com> References: <1363552234-6752-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 25db628..276c0ef 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -843,22 +843,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;