From patchwork Mon Mar 31 10:39:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3913561 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 7D5E19F357 for ; Mon, 31 Mar 2014 11:43:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92C85203AC for ; Mon, 31 Mar 2014 11:43:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8179F20386 for ; Mon, 31 Mar 2014 11:43:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752910AbaCaLnI (ORCPT ); Mon, 31 Mar 2014 07:43:08 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:36346 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752150AbaCaLnF (ORCPT ); Mon, 31 Mar 2014 07:43:05 -0400 Received: by mail-wi0-f181.google.com with SMTP id hm4so3127877wib.8 for ; Mon, 31 Mar 2014 04:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JLdB6KfoSu5gS1wgHTkxVGCmoC44IW+n9kTEwBIjP2I=; b=wRxs3hNqJECwlTYm+Dr1XgMJTAL0FDFkwjtNqUve0nO6yLiU5RpnuVx7yVIMNg+D+J io5E/kmJUjVujpLXwxAjVug+a7YLqIP4lLZGwsFepTlovEKhjEDX0XwsPnSZE0/9XV8e u8YhhVtTtsew0rs3GKNe5zhKAVPsX7X/Dqeqo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JLdB6KfoSu5gS1wgHTkxVGCmoC44IW+n9kTEwBIjP2I=; b=BVfaPT9KPdbwR5P3BWBuZEnPxH2Mcqu8ZsH3nmB4FSvfoxsLUfD8rg0Gs0F8yQFZAO En3LG9zXqkZa3yuhfazwQh5m4ppsee/OwfcdPWoe7MKoYZ/prwRNpb1Y6osdn1UfCTa6 Qo3SoMeWGp3/GrvC7cFa36Wl5ClikavjCx1kHhSnYvX2I79jxa0RKsTvYf4xT+HLH4T7 6iQwgQNs4IYhSmsyPcMEookS/o9rKPt+qroLWse6fEn550h7Zrac+1gAsdw30lBbxlsZ p6q5/gtUDTL+zrUuo7tdAKI162J9xrgtEGRAECMJ7Jw78k+MqgXYIqcP1z5NNc0yuVL9 J4aA== X-Gm-Message-State: ALoCoQk06jmtFKz4A8CojUV8zRinWxCFMAQNYAVRP3WqBAnsiMJFHroKVAUX7zMFXDbjCbfH+sDCYbzgiMuZVZVvlQqheT7+iKrnKV2ezLLHM2glKNSSKYY= X-Received: by 10.180.100.72 with SMTP id ew8mr11842205wib.16.1396266183412; Mon, 31 Mar 2014 04:43:03 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id q49sm32467516eem.34.2014.03.31.04.43.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Mar 2014 04:43:02 -0700 (PDT) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH v3 01/13] cfg80211: allow drivers to iterate over matching combinations Date: Mon, 31 Mar 2014 12:39:19 +0200 Message-Id: <1396262371-6466-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1396262371-6466-1-git-send-email-michal.kazior@tieto.com> References: <1395409651-26120-1-git-send-email-michal.kazior@tieto.com> <1396262371-6466-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 The patch splits cfg80211_check_combinations() into an iterator function and a simple iteration user. This makes it possible for drivers to asses how many channels can use given iftype setup. This in turn can be used for future multi-interface/multi-channel channel switching. Signed-off-by: Michal Kazior --- include/net/cfg80211.h | 27 +++++++++++++++++++++++++++ net/wireless/util.c | 44 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index b4ea653..af26751 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -4730,6 +4730,33 @@ int cfg80211_check_combinations(struct wiphy *wiphy, void cfg80211_stop_iface(struct wiphy *wiphy, struct wireless_dev *wdev, gfp_t gfp); +/** + * cfg80211_iter_combinations - iterate over matching combinations + * + * @wiphy: the wiphy + * @num_different_channels: the number of different channels we want + * to use for verification + * @radar_detect: a bitmap where each bit corresponds to a channel + * width where radar detection is needed, as in the definition of + * &struct ieee80211_iface_combination.@radar_detect_widths + * @iftype_num: array with the numbers of interfaces of each interface + * type. The index is the interface type as specified in &enum + * nl80211_iftype. + * @iter: function to call for each matching combination + * @data: pointer to pass to iter function + * + * This function can be called by the driver to check what possible + * combinations it fits in at a given moment, e.g. for channel switching + * purposes. + */ +int cfg80211_iter_combinations(struct wiphy *wiphy, + const int num_different_channels, + const u8 radar_detect, + const int iftype_num[NUM_NL80211_IFTYPES], + void (*iter)(const struct ieee80211_iface_combination *c, + void *data), + void *data); + /* Logging, debugging and troubleshooting/diagnostic helpers. */ /* wiphy_printk helpers, similar to dev_printk */ diff --git a/net/wireless/util.c b/net/wireless/util.c index 31b93b9..f9928f2 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1250,10 +1250,13 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev, return res; } -int cfg80211_check_combinations(struct wiphy *wiphy, - const int num_different_channels, - const u8 radar_detect, - const int iftype_num[NUM_NL80211_IFTYPES]) +int cfg80211_iter_combinations(struct wiphy *wiphy, + const int num_different_channels, + const u8 radar_detect, + const int iftype_num[NUM_NL80211_IFTYPES], + void (*iter)(const struct ieee80211_iface_combination *c, + void *data), + void *data) { int i, j, iftype; int num_interfaces = 0; @@ -1310,13 +1313,40 @@ int cfg80211_check_combinations(struct wiphy *wiphy, /* This combination covered all interface types and * supported the requested numbers, so we're good. */ - kfree(limits); - return 0; + + (*iter)(c, data); cont: kfree(limits); } - return -EBUSY; + return 0; +} +EXPORT_SYMBOL(cfg80211_iter_combinations); + +static void +cfg80211_iter_sum_ifcombs(const struct ieee80211_iface_combination *c, + void *data) +{ + int *num = data; + (*num)++; +} + +int cfg80211_check_combinations(struct wiphy *wiphy, + const int num_different_channels, + const u8 radar_detect, + const int iftype_num[NUM_NL80211_IFTYPES]) +{ + int err, num = 0; + + err = cfg80211_iter_combinations(wiphy, num_different_channels, + radar_detect, iftype_num, + cfg80211_iter_sum_ifcombs, &num); + if (err) + return err; + if (num == 0) + return -EBUSY; + + return 0; } EXPORT_SYMBOL(cfg80211_check_combinations);