Return-path: 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) 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> (sfid-20130317_213101_559116_4C00925B) 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 List-ID: 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; -- 1.7.9.dirty