diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-04-30 10:46:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-04-30 10:46:15 +1000 |
| commit | 4f3d506c37ec946a757e26fcd50d4004af4fe739 (patch) | |
| tree | c60879b501369cca383a90213b981209964a7062 /net | |
| parent | 027aa605505866a7a9d8b3458ee83ff8c54345c4 (diff) | |
| parent | 8db0c433692eda3a0358d72643bd0268b736767c (diff) | |
Merge remote-tracking branch 'mac80211-next/master'
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/reg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index ac3e12c32aa3..6687295033f9 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1653,7 +1653,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"; @@ -2619,7 +2619,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; } |