Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8db0c433 authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Johannes Berg
Browse files

regulatory: Rename confusing 'country IE' in log output 



The 'country IE' messages in the log can be confusing and make people think
that the country code has been set to Ireland. Fix this by changing the
log messages to use 'country element' instead (as they are no longer called
'information element' in the spec anyway).

Reported-by: default avatarBernhard Gabler <Bernhard_Gabler@web.de>
Signed-off-by: default avatarToke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e4a2eb89

net/wireless/reg.c

+2 −2
Original line number Diff line number Diff line
@@ -1652,7 +1652,7 @@ const char *reg_initiator_name(enum nl80211_reg_initiator initiator) 
	case NL80211_REGDOM_SET_BY_DRIVER:

		return "driver";

	case NL80211_REGDOM_SET_BY_COUNTRY_IE:

		return "country IE";

		return "country element";

	default:

		WARN_ON(1);

		return "bug";
@@ -2618,7 +2618,7 @@ reg_process_hint_country_ie(struct wiphy *wiphy, 
		 * This doesn't happen yet, not sure we

		 * ever want to support it for this case.

		 */

		WARN_ONCE(1, "Unexpected intersection for country IEs");

		WARN_ONCE(1, "Unexpected intersection for country elements");

		return REG_REQ_IGNORE;

	}