From patchwork Thu Apr 19 09:17:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 10349341 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2514B60244 for ; Thu, 19 Apr 2018 09:18:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 173C22898C for ; Thu, 19 Apr 2018 09:18:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BEBA289A2; Thu, 19 Apr 2018 09:18:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 820012898C for ; Thu, 19 Apr 2018 09:18:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751184AbeDSJSP (ORCPT ); Thu, 19 Apr 2018 05:18:15 -0400 Received: from mail.toke.dk ([52.28.52.200]:58271 "EHLO mail.toke.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751135AbeDSJSO (ORCPT ); Thu, 19 Apr 2018 05:18:14 -0400 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=toke.dk; s=20161023; t=1524129493; bh=9yyNn6C9IKscmTbdlV6rheTMUW2CVjzBuFUIbiieafM=; h=From:To:Cc:Subject:Date:From; b=SzBh9FK1HUC4gb39gppYoMXy7a/w/+8IuRv+By6xwNiR2+fBpBOGqIIi+hYV/eeuK 6oahJw1SJ+wzfzGf7WQSdno+5LbYElAWbPrM5Tw+OUcDv9ax39rFbcMgiAnbtKhA8F /XRJXTCh/wDAUGMXbA3kKWhkXxdq3c0m5lqtmr62ikdfJpsNsGLtNTvzaQRe8ykmeb fPW02WjpftWmTm/WhovUcHIWbaGUgORI1vJho+8edtgxdQN0vXQRS93OXBnRDA9EqQ 1mtnsbs+9U4QAlWJWe8v09Up3h9N2aarq/xe/KAw2DaGKbw3cfzxYvItpV4qEey748 dJmaLlBprdknA== To: linux-wireless@vger.kernel.org Cc: Bernhard_Gabler@web.de, =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH] reg: Rename confusing 'country IE' in log output Date: Thu, 19 Apr 2018 11:17:38 +0200 Message-Id: <20180419091738.9068-1-toke@toke.dk> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Toke Høiland-Jørgensen --- net/wireless/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 16c7e4ef5820..ecfee5f06c76 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -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; }