wireless: regulatory: reduce log level of CRDA related messages (042ab5fc) · Commits · 戴 / test

With a basic Linux userspace, the messages "Calling CRDA to update world regulatory domain" appears 10 times after boot every second or so, followed by a final "Exceeded CRDA call max attempts. Not calling CRDA". For those of us not having the corresponding userspace parts, having those messages repeatedly displayed at boot time is a bit annoying, so this commit reduces their log level to pr_debug(). Signed-off-by:

Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/wireless/reg.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -544,15 +544,15 @@ static int call_crda(const char *alpha2)
	reg_regdb_query(alpha2);		reg_regdb_query(alpha2);

	if (reg_crda_timeouts > REG_MAX_CRDA_TIMEOUTS) {		if (reg_crda_timeouts > REG_MAX_CRDA_TIMEOUTS) {
	pr_info("Exceeded CRDA call max attempts. Not calling CRDA\n");		pr_debug("Exceeded CRDA call max attempts. Not calling CRDA\n");
	return -EINVAL;		return -EINVAL;
	}		}

	if (!is_world_regdom((char *) alpha2))		if (!is_world_regdom((char *) alpha2))
	pr_info("Calling CRDA for country: %c%c\n",		pr_debug("Calling CRDA for country: %c%c\n",
	alpha2[0], alpha2[1]);		alpha2[0], alpha2[1]);
	else		else
	pr_info("Calling CRDA to update world regulatory domain\n");		pr_debug("Calling CRDA to update world regulatory domain\n");

	return kobject_uevent_env(&reg_pdev->dev.kobj, KOBJ_CHANGE, env);		return kobject_uevent_env(&reg_pdev->dev.kobj, KOBJ_CHANGE, env);
	}		}

Admin message