From patchwork Sun Jan 15 13:03:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krishna Chaitanya X-Patchwork-Id: 715433 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v1c4c4gMyz9stc for ; Mon, 16 Jan 2017 00:03:43 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YcE3cTih"; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D654DB90BBE; Sun, 15 Jan 2017 14:03:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Sun, 15 Jan 2017 14:03:31 +0100 (CET) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 9FAD0B802D5 for ; Sun, 15 Jan 2017 14:03:30 +0100 (CET) X-policyd-weight: using cached result; rate: -7 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 15 Jan 2017 14:03:29 +0100 (CET) Received: by mail-wm0-f66.google.com with SMTP id r126so23913164wmr.3 for ; Sun, 15 Jan 2017 05:03:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=owJQRmaKGUr2lNAUnZ/E3kUD7Do56meOmHqUwM266vE=; b=YcE3cTih+2Gk4H5QRnfxh3dAlMEQa2uKEyHLNn14pHXRtrp3jIpMGBZnc4WPh4fQX6 EpjD2JOjObUOj/FJgoXv6/1T+DXK8Kx4gLCz+7DzosNHeQk7RDpd1axhrGpWkzwlp9RA WkzB1dI09YlN66wLeLwhm4KM/nl5HJ4TLlHmC9xAI6qtP7auQ5sm6UJ1rUHz7fByHdKm 3mBr0D7k5iP+iMLONapTVE/YS/ZxeFtANfb5FfQetE4Hh+xVgbveDI43LgO/L3StauTv obOW0Tbg5ih4TrsTpSmn4lh8SWHCUcFKLWe3LacBrWL7PC9pBX1GCe6ndCyc9aZd1W2g /lbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=owJQRmaKGUr2lNAUnZ/E3kUD7Do56meOmHqUwM266vE=; b=Ehd9YM62fHvkDqfZ0jswz+9tr6uUQuNGLs/xWVBSPs/Cvxgu+7X9O5BvMtA9bHlXBQ ++wKF4wE9rKnEYZxEGdELjSQ+oc/zJYBHdmGH/5RdyAMeJu/p/1mp1fKUv7AN6tQTp5s acTwFXxX31kkl/P6cPBJJBYn/4nhlaI5J64HcTOTny5jOF8Dwx0aMmA3MVAxy/1d/zd4 9it5ER70/2tZ2+OglnsnKPBA3hQRaJs3Ynw2U/UHNfMYXa9z7NZPeNz74SgryMPwvr2h i5DQCiDI9+spVtgQyDsu+ixJCUqsmFKxCLgZZbK1mMaqGWFA7iVfqJfCPtYOopuVc/9/ m/5Q== X-Gm-Message-State: AIkVDXIrU6UJhpCEc7dtacqfd5Zve9KOMiqPOMYRytOET7/ruZ8POM5NsOMOQCxB/Qf8Cg== X-Received: by 10.28.129.147 with SMTP id c141mr9513212wmd.12.1484485408916; Sun, 15 Jan 2017 05:03:28 -0800 (PST) Received: from rambo.hb.imgtec.org ([115.112.122.66]) by smtp.gmail.com with ESMTPSA id d199sm21790683wmd.0.2017.01.15.05.03.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 15 Jan 2017 05:03:27 -0800 (PST) From: Chaitanya Tata X-Google-Original-From: Chaitanya Tata To: xm@subsignal.org Date: Sun, 15 Jan 2017 18:33:11 +0530 Message-Id: <1484485391-1931-1-git-send-email-Chaitanya.Tata@imgtec.com> X-Mailer: git-send-email 1.9.1 Subject: [OpenWrt-Devel] [PATCH] iwinfo: Check DFS support before enabling DFS channels X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul.Blay@imgtec.com, openwrt-devel@lists.openwrt.org, Tushar.Jobanputra@imgtec.com, Chaitanya Tata MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Before enabling the DFS channels looks for support of DFS in interface combinations, NO_IR and DFS flags. Currently BW level checks are not supported. Tested-by: Tushar Jobanputra Signed-of-by: Chaitanya Tata --- iwinfo_nl80211.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 6 deletions(-) diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c index 63b70d5..d8d2670 100644 --- a/iwinfo_nl80211.c +++ b/iwinfo_nl80211.c @@ -2404,20 +2404,71 @@ static int nl80211_get_scanlist(const char *ifname, char *buf, int *len) return -1; } +char *channel_width_name(enum nl80211_chan_width width) +{ + switch (width) { + case NL80211_CHAN_WIDTH_20_NOHT: + return "20 MHz (no HT)"; + case NL80211_CHAN_WIDTH_20: + return "20 MHz"; + case NL80211_CHAN_WIDTH_40: + return "40 MHz"; + case NL80211_CHAN_WIDTH_80: + return "80 MHz"; + case NL80211_CHAN_WIDTH_80P80: + return "80+80 MHz"; + case NL80211_CHAN_WIDTH_160: + return "160 MHz"; + default: + return "unknown"; + } +} + static int nl80211_get_freqlist_cb(struct nl_msg *msg, void *arg) { - int bands_remain, freqs_remain; + int if_comb_remain, bands_remain, freqs_remain,comb_limits_remain; struct nl80211_array_buf *arr = arg; struct iwinfo_freqlist_entry *e = arr->buf; struct nlattr **attr = nl80211_parse(msg); + struct nlattr *combs[MAX_NL80211_IFACE_COMB + 1]; struct nlattr *bands[NL80211_BAND_ATTR_MAX + 1]; struct nlattr *freqs[NL80211_FREQUENCY_ATTR_MAX + 1]; - struct nlattr *band, *freq; + struct nlattr *comb, *band, *freq,*comb_limit; + struct nlattr *comb_limits[MAX_NL80211_IFACE_COMB + 1]; + bool dfs_support = 0; + unsigned int widths = 0; + + nla_for_each_nested(comb, attr[NL80211_ATTR_INTERFACE_COMBINATIONS], bands_remain) + { + + nla_parse(combs, MAX_NL80211_IFACE_COMB, + nla_data(comb), nla_len(comb), NULL); + + nla_for_each_nested(comb_limit, combs[NL80211_IFACE_COMB_LIMITS], comb_limits_remain) + { + nla_parse(comb_limits, MAX_NL80211_IFACE_LIMIT, + nla_data(comb_limit), nla_len(comb_limit), NULL); + + if (!comb_limits[NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS]) + continue; + + widths = nla_get_u32(comb_limits[NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS]); + /* Curently there is no 1-1 mappng between + * freq and cbw, so we cannot check dfs support + * for different cbw. + */ + if (widths) + dfs_support = true; + + } + + } nla_for_each_nested(band, attr[NL80211_ATTR_WIPHY_BANDS], bands_remain) { + struct nlattr *is_ir,*is_dfs; nla_parse(bands, NL80211_BAND_ATTR_MAX, nla_data(band), nla_len(band), NULL); @@ -2433,16 +2484,18 @@ static int nl80211_get_freqlist_cb(struct nl_msg *msg, void *arg) e->mhz = nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]); e->channel = nl80211_freq2channel(e->mhz); - e->restricted = ( - freqs[NL80211_FREQUENCY_ATTR_NO_IR] && - !freqs[NL80211_FREQUENCY_ATTR_RADAR] - ) ? 1 : 0; + is_ir = freqs[NL80211_FREQUENCY_ATTR_NO_IR] ; + is_dfs = freqs[NL80211_FREQUENCY_ATTR_RADAR]; + + e->restricted = is_ir || (is_dfs && !dfs_support); e++; arr->count++; } } + + return NL_SKIP; }