Skip to content

Commit

Permalink
cfg80211: call_crda() won't tell us if CRDA was present
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luis R. Rodriguez authored and John W. Linville committed Nov 25, 2008
1 parent a01ddaf commit 02ba0b3
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 02ba0b3

Please sign in to comment.