aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-01-22 18:05:43 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:46:43 -0500
commit667ecd010d870f861a9e276aaaca8cb443ded8b3 (patch)
tree6e5ba6b3ac30412a1aa517f17acd8d329b986ea4 /net
parent615aab4b75dfa77b00c372330d6f70edd2458bf9 (diff)
cfg80211: print correct intersected regulatory domain
When CONFIG_CFG80211_REG_DEBUG is enabled and an intersection occurs we are printing the regulatory domain passed by CRDA and indicating its the intersected regulatory domain. Lets fix this and print the intersection as originally intended. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 61698095e1ad..85c9034c59b2 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1284,7 +1284,7 @@ static void reg_country_ie_process_debug(
1284 if (intersected_rd) { 1284 if (intersected_rd) {
1285 printk(KERN_DEBUG "cfg80211: We intersect both of these " 1285 printk(KERN_DEBUG "cfg80211: We intersect both of these "
1286 "and get:\n"); 1286 "and get:\n");
1287 print_regdomain_info(rd); 1287 print_regdomain_info(intersected_rd);
1288 return; 1288 return;
1289 } 1289 }
1290 printk(KERN_DEBUG "cfg80211: Intersection between both failed\n"); 1290 printk(KERN_DEBUG "cfg80211: Intersection between both failed\n");