From patchwork Wed Feb 12 18:54:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz.Dziedzic@tieto.com X-Patchwork-Id: 3639951 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 E48459F383 for ; Wed, 12 Feb 2014 18:54:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 14EE5201F2 for ; Wed, 12 Feb 2014 18:54:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EDB3201ED for ; Wed, 12 Feb 2014 18:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753941AbaBLSyl (ORCPT ); Wed, 12 Feb 2014 13:54:41 -0500 Received: from mail-ee0-f50.google.com ([74.125.83.50]:55164 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753481AbaBLSyj (ORCPT ); Wed, 12 Feb 2014 13:54:39 -0500 Received: by mail-ee0-f50.google.com with SMTP id d17so4510479eek.23 for ; Wed, 12 Feb 2014 10:54:38 -0800 (PST) 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=2F7rqVdqYZ5rEsgOjKgG6BH0QonKYv+5jXqyizw4s0k=; b=EFuHjHjAYKD71zYvuMJL/msQUc5kl5/RWOifkEISULcChWkbgvFy9lgCPGpX+PtSMy gMTEXT0a7hImfCsn0IFJcU2QrQgVDeq0mZd3DUA9wUpQaK+UkYOgO6t8nYnZow+mCkOI D2Q1in40xr0E49LXmWcNefL5+DgxE4zUzcgoM= 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=2F7rqVdqYZ5rEsgOjKgG6BH0QonKYv+5jXqyizw4s0k=; b=ckPBkr4Oynj+rTKFBAg4dyIDnF9zeOS6a8DqQGP8IJlYMoCFn011hHe9ags2LV/w7W ojjNnwV6ky5wMeuixzoK/srOSgdK5weyKvAaUS9PElQArUqDr+0LG3gGptYBecYKbkTH HLWrdAHaVfzKgZ72vPyhgWGB4V97xX1svgo8YyAaa8bF+fISo9Jo1DQk0jwzGFK6HopR omk9IMVTy4OjI+vn7fS8dBbt5UAdys+3OFbp0KlvimYmu2XR0pC9S07Ic6igj3UDB+0z p2u8OqoQFWjJoyn5yDZSrkvg9WTrIQIgwHQqT6bV8cz5ZMfFi5VfaAvSZ4syClWykVt2 yrZQ== X-Gm-Message-State: ALoCoQkCiOb/u83bAGt+90FRZnrIFI+IWFX6kxVBGdqg8XdHHlZ8jij1WhGPV43cUD5FYlHnpUW61skWqJiInMHnbW0KNvc+NJ2JR6o0dk/5qbTvj8B5nOw= X-Received: by 10.15.65.68 with SMTP id p44mr5581023eex.63.1392231278294; Wed, 12 Feb 2014 10:54:38 -0800 (PST) Received: from localhost.localdomain (host-62-141-194-198.swidnica.mm.pl. [62.141.194.198]) by mx.google.com with ESMTPSA id x2sm84113214eeo.8.2014.02.12.10.54.37 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Feb 2014 10:54:37 -0800 (PST) From: Janusz Dziedzic To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, mcgrof@do-not-panic.com, linville@tuxdriver.com, Janusz Dziedzic Subject: [PATCH 2/4] cfg80211: parse DFS CAC time for internal regdb option Date: Wed, 12 Feb 2014 19:54:21 +0100 Message-Id: <1392231266-28479-2-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1392231266-28479-1-git-send-email-janusz.dziedzic@tieto.com> References: <1392231266-28479-1-git-send-email-janusz.dziedzic@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 Add support for parsing DFS CAC time when internal regulatory database is used. Signed-off-by: Janusz Dziedzic --- net/wireless/genregdb.awk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/wireless/genregdb.awk b/net/wireless/genregdb.awk index 9a8217d..7683b47 100644 --- a/net/wireless/genregdb.awk +++ b/net/wireless/genregdb.awk @@ -66,6 +66,7 @@ function parse_reg_rule() units = $8 sub(/\)/, "", units) sub(/,/, "", units) + dfs_cac = $9 if (units == "mW") { if (power == 100) { power = 20 @@ -78,7 +79,12 @@ function parse_reg_rule() } else { print "Unknown power value in database!" } + } else { + dfs_cac = $8 } + sub(/,/, "", dfs_cac) + sub(/\(/, "", dfs_cac) + sub(/\)/, "", dfs_cac) flagstr = "" for (i=8; i<=NF; i++) flagstr = flagstr $i @@ -109,7 +115,7 @@ function parse_reg_rule() } flags = flags "0" - printf "\t\tREG_RULE(%d, %d, %d, %d, %d, %s),\n", start, end, bw, gain, power, flags + printf "\t\tREG_RULE_EXT(%d, %d, %d, %d, %d, %d, %s),\n", start, end, bw, gain, power, dfs_cac, flags rules++ }