From patchwork Mon Mar 25 20:51:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 2333531 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 265DA3FC54 for ; Mon, 25 Mar 2013 20:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932238Ab3CYUwW (ORCPT ); Mon, 25 Mar 2013 16:52:22 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:54704 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756583Ab3CYUwU (ORCPT ); Mon, 25 Mar 2013 16:52:20 -0400 Received: by mail-wi0-f178.google.com with SMTP id ez12so2582101wid.17 for ; Mon, 25 Mar 2013 13:52:19 -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=sLVsQGy5Sed/MsjLRQQ0NPKPfrJb90J9UXd5DUrSgBo=; b=yj3A811Mv3g710h4w+S3agoiw0cyuliP9omz+LnNqQ6ZMuo4+I26bbT7vjNRzHsKgR eYb1VpaYOI/TWAk2ej4WPbKVK7jmodCOwf6US/08ihjiy3U+YGsboK6Ng4tE/BGp2q5e lNWrCVc4un5ovCiRGd4Xlnr2wlUlkfbcs0iCFbJE7KZBejiHb5jsY6l60WiEztBCFkmP MCTqyHDhiEaDWs77EdAotrw3zZKPbJ5P7i4+EnBDwBLYktVWfaS7n4cgbjccUlJUcjX1 IX8vncaukof6TCk+qqTuHKGWOlPP1IdeyCa2RHME3HVhPfYa3/oz9rh+md2yjGa4+lFy JULQ== X-Received: by 10.194.178.9 with SMTP id cu9mr20668673wjc.39.1364244739138; Mon, 25 Mar 2013 13:52:19 -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 h10sm24915991wic.8.2013.03.25.13.52.17 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Mar 2013 13:52:18 -0700 (PDT) From: Karl Beldan To: Johannes Berg Cc: linux-wireless , fengguang.wu@intel.com, Karl Beldan , Karl Beldan Subject: [PATCH v2 2/3] Let drivers not supporting channel contexts use VHT Date: Mon, 25 Mar 2013 21:51:44 +0100 Message-Id: <1364244705-31108-3-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.7.9.dirty In-Reply-To: <1364244705-31108-1-git-send-email-karl.beldan@gmail.com> References: <1364244705-31108-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 a16b037..52136fd 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -840,22 +840,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;