Skip to content

Commit

Permalink
regulatory: Rename confusing 'country IE' in log output
Browse files Browse the repository at this point in the history
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: Bernhard Gabler <Bernhard_Gabler@web.de>
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Toke Høiland-Jørgensen authored and Johannes Berg committed Apr 19, 2018
1 parent e4a2eb8 commit 8db0c43
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 8db0c43

Please sign in to comment.