aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2008-11-12 17:22:00 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-11-25 16:41:25 -0500
commit02ba0b3263f4eb41d2a5714cbe99207ae491a964 (patch)
tree02305175dd4a060523a1ff5abe56f094cdcf2d59 /net/wireless
parenta01ddafd43f7d53a65ef053eb80a4dee58839c1f (diff)
cfg80211: call_crda() won't tell us if CRDA was present
kobject_uevent_env() can return an error but it just tells us if the uvent was built/sent or not, it doesn't tell us anything about what happened in userspace, whether the udev rule was present nor does it tell us if CRDA was present or not. So remove the informative complaint about it assuming it will tell us such things. Note that you can determine if CRDA is present after loading cfg80211 by using: is_old_static_regdom(cfg80211_regdomain) but this doesn't account for possible user install after initial boot, and also for when the user uses the static EU regulatory domain. 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/wireless')
-rw-r--r--net/wireless/reg.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index f062b8b7000a..f8e7beb23add 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -711,14 +711,7 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
711 711
712 kfree(last_request); 712 kfree(last_request);
713 last_request = request; 713 last_request = request;
714 r = call_crda(alpha2); 714 return call_crda(alpha2);
715
716#ifndef CONFIG_WIRELESS_OLD_REGULATORY
717 if (r)
718 printk(KERN_ERR "cfg80211: Failed calling CRDA\n");
719#endif
720
721 return r;
722} 715}
723 716
724void regulatory_hint(struct wiphy *wiphy, const char *alpha2) 717void regulatory_hint(struct wiphy *wiphy, const char *alpha2)