[crda] Add patch for regdbdump to display DFS region

[John W. Linville]

commit 9f115568e002fe1b086eb4b7a2cba844302f1ab4
Author: John W. Linville <linville at tuxdriver.com>
Date:   Fri Jan 17 13:16:14 2014 -0500

    Add patch for regdbdump to display DFS region

 ...isplay-DFS-regulatory-domain-in-regdbdump.patch |   51 ++++++++++++++++++++
 crda.spec                                          |    9 +++-
 2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --git a/crda-display-DFS-regulatory-domain-in-regdbdump.patch b/crda-display-DFS-regulatory-domain-in-regdbdump.patch
new file mode 100644
index 0000000..3ef85c2
--- /dev/null
+++ b/crda-display-DFS-regulatory-domain-in-regdbdump.patch
@@ -0,0 +1,51 @@
+From d169aaf0290c2a6f8b38769e22ced4d3850da7a9 Mon Sep 17 00:00:00 2001
+From: Zefir Kurtisi <zefir.kurtisi at neratec.com>
+Date: Wed, 3 Apr 2013 15:51:58 +0200
+Subject: [PATCH] crda: display DFS regulatory domain in regdbdump
+
+Signed-off-by: Zefir Kurtisi <zefir.kurtisi at neratec.com>
+Signed-off-by: Luis R. Rodriguez <mcgrof at do-not-panic.com>
+---
+ print-regdom.c | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/print-regdom.c b/print-regdom.c
+index 075eea890579..9c65872d4775 100644
+--- a/print-regdom.c
++++ b/print-regdom.c
+@@ -7,6 +7,22 @@
+ 
+ #include "reglib.h"
+ 
++static const char *dfs_domain_name(enum nl80211_dfs_regions region)
++{
++	switch (region) {
++	case NL80211_DFS_UNSET:
++		return "DFS-UNSET";
++	case NL80211_DFS_FCC:
++		return "DFS-FCC";
++	case NL80211_DFS_ETSI:
++		return "DFS-ETSI";
++	case NL80211_DFS_JP:
++		return "DFS-JP";
++	default:
++		return "DFS-invalid";
++	}
++}
++
+ static void print_reg_rule(struct ieee80211_reg_rule *rule)
+ {
+ 	struct ieee80211_freq_range *freq;
+@@ -57,7 +73,8 @@ static void print_reg_rule(struct ieee80211_reg_rule *rule)
+ void print_regdom(struct ieee80211_regdomain *rd)
+ {
+ 	unsigned int i;
+-	printf("country %.2s:\n", rd->alpha2);
++	printf("country %.2s: %s\n", rd->alpha2,
++	       dfs_domain_name(rd->dfs_region));
+ 	for (i = 0; i < rd->n_reg_rules; i++)
+ 		print_reg_rule(&rd->reg_rules[i]);
+ 	printf("\n");
+-- 
+1.8.1.4
+
diff --git a/crda.spec b/crda.spec
index b180265..531ea18 100644
--- a/crda.spec
+++ b/crda.spec
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -27,6 +27,7 @@ Source3:        setregdomain.1
 
 # Add udev rule to call setregdomain on wireless device add
 Patch0:         regulatory-rules-setregdomain.patch
+Patch1:         crda-display-DFS-regulatory-domain-in-regdbdump.patch
 
 
 %description
@@ -42,6 +43,9 @@ communication from the kernel.
 
 %patch0 -p1 -b .setregdomain
 
+cd crda-%{crda_version}
+%patch1 -p1 -b .display-DFS
+
 
 %build
 export CFLAGS="%{optflags}"
@@ -95,6 +99,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 17 2014 John W. Linville <linville at redhat.com> - 1.1.3_2013.11.27-2
+- Add patch for regdbdump to display DFS region
+
 * Mon Dec  2 2013 John W. Linville <linville at redhat.com> - 1.1.3_2013.11.27-1
 - Update wireless-regdb to version 2013.11.27