From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Thu, 22 Jan 2009 23:05:43 +0000 (-0800)
Subject: cfg80211: print correct intersected regulatory domain
X-Git-Tag: v2.6.29-rc4~91^2~14^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=667ecd010d870f861a9e276aaaca8cb443ded8b3;p=~emulex%2Finfiniband.git

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>
---

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 61698095e1a..85c9034c59b 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1284,7 +1284,7 @@ static void reg_country_ie_process_debug(
 	if (intersected_rd) {
 		printk(KERN_DEBUG "cfg80211: We intersect both of these "
 			"and get:\n");
-		print_regdomain_info(rd);
+		print_regdomain_info(intersected_rd);
 		return;
 	}
 	printk(KERN_DEBUG "cfg80211: Intersection between both failed\n");