On Thu, 2008-11-06 at 12:45 -0800, Luis R. Rodriguez wrote: > 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@xxxxxxxxxxx> Less code! :)) Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > --- > net/wireless/reg.c | 9 +-------- > 1 files changed, 1 insertions(+), 8 deletions(-) > > diff --git a/net/wireless/reg.c b/net/wireless/reg.c > index f062b8b..f8e7beb 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, > > kfree(last_request); > last_request = request; > - r = call_crda(alpha2); > - > -#ifndef CONFIG_WIRELESS_OLD_REGULATORY > - if (r) > - printk(KERN_ERR "cfg80211: Failed calling CRDA\n"); > -#endif > - > - return r; > + return call_crda(alpha2); > } > > void regulatory_hint(struct wiphy *wiphy, const char *alpha2)
Attachment:
signature.asc
Description: This is a digitally signed message part
