提交 8db0c433 编写于 作者: T Toke Høiland-Jørgensen 提交者: Johannes Berg

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: NBernhard Gabler <Bernhard_Gabler@web.de>
Signed-off-by: NToke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
上级 e4a2eb89
...@@ -1652,7 +1652,7 @@ const char *reg_initiator_name(enum nl80211_reg_initiator initiator) ...@@ -1652,7 +1652,7 @@ const char *reg_initiator_name(enum nl80211_reg_initiator initiator)
case NL80211_REGDOM_SET_BY_DRIVER: case NL80211_REGDOM_SET_BY_DRIVER:
return "driver"; return "driver";
case NL80211_REGDOM_SET_BY_COUNTRY_IE: case NL80211_REGDOM_SET_BY_COUNTRY_IE:
return "country IE"; return "country element";
default: default:
WARN_ON(1); WARN_ON(1);
return "bug"; return "bug";
...@@ -2618,7 +2618,7 @@ reg_process_hint_country_ie(struct wiphy *wiphy, ...@@ -2618,7 +2618,7 @@ reg_process_hint_country_ie(struct wiphy *wiphy,
* This doesn't happen yet, not sure we * This doesn't happen yet, not sure we
* ever want to support it for this case. * 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; return REG_REQ_IGNORE;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册