From patchwork Wed Jun 26 22:06:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pedersen X-Patchwork-Id: 2788981 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B0C1C9F245 for ; Wed, 26 Jun 2013 22:09:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C947320224 for ; Wed, 26 Jun 2013 22:09:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01A972021F for ; Wed, 26 Jun 2013 22:09:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752993Ab3FZWJm (ORCPT ); Wed, 26 Jun 2013 18:09:42 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:59750 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752841Ab3FZWJl (ORCPT ); Wed, 26 Jun 2013 18:09:41 -0400 Received: by mail-pd0-f179.google.com with SMTP id q10so3839pdj.38 for ; Wed, 26 Jun 2013 15:09:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=5pSiks206A/u+L9WcDdl5HLwR62jAYbkgfSP692gaDs=; b=j5dVBB12rkYDkHoVQrKoWaJV/tcBvktruAuIZgBDGraKZrkBs8/VdvCRnbNuMfMSvc a+tViTRoG5T0F5nV6NpEjmeY3efQMCZ5j8wc28+qJdqaiaQOcppBefizR/KJVGlF7f2p eUvIJsC4rwSQL0nmkpqFRb3RaY8WAsBOvKik9DckrVsRjkLCB5Xzny0jFWl4E7jDAS/3 pmo2CwMzWlJa3356QW6LM1FnOQLOhM7/Oe40DhvZDokFXp/hvfNlLdKDJ1ANL0kX236p Xcyl24zRPC3GrTWjWQH6M0fSd56LH/2ZqivmGa/q8Zfy1VWDTpyHxLQMNIGErxz/O+rW CjaA== X-Received: by 10.68.182.33 with SMTP id eb1mr2799762pbc.186.1372284581236; Wed, 26 Jun 2013 15:09:41 -0700 (PDT) Received: from cable.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPSA id kc8sm24159705pbc.18.2013.06.26.15.09.39 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Jun 2013 15:09:40 -0700 (PDT) From: Thomas Pedersen To: "John W. Linville" Cc: ath9k , linux-wireless , linux@rempel-privat.de, Thomas Pedersen Subject: [PATCH] ath9k_htc: ifdef out IFTYPE_MESH advertisement Date: Wed, 26 Jun 2013 15:06:58 -0700 Message-Id: <1372284419-13945-1-git-send-email-thomas@cozybit.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQm2aOhOw0x0hICNTOBctzpMbR+ZpZBobqopTw9JHMo8WTrz6rekIP5UIFaL4Ubt5dcIQ1UJ Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is needed so the interface combination can still be validated when CONFIG_MAC80211_MESH is not enabled. Otherwise wiphy registration fails. Signed-off-by: Thomas Pedersen --- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index bb0ba9e..07ca932 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c @@ -701,8 +701,10 @@ static const struct ieee80211_iface_limit if_limits[] = { { .max = 2, .types = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_P2P_CLIENT) }, { .max = 2, .types = BIT(NL80211_IFTYPE_AP) | - BIT(NL80211_IFTYPE_P2P_GO) | - BIT(NL80211_IFTYPE_MESH_POINT) }, +#ifdef CONFIG_MAC80211_MESH + BIT(NL80211_IFTYPE_MESH_POINT) | +#endif + BIT(NL80211_IFTYPE_P2P_GO) }, }; static const struct ieee80211_iface_combination if_comb = {