From patchwork Mon Jan 22 17:04:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Beichler X-Patchwork-Id: 10178905 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 C9A85601D5 for ; Mon, 22 Jan 2018 17:05:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5F8928414 for ; Mon, 22 Jan 2018 17:05:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A995E28415; Mon, 22 Jan 2018 17:05:01 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 51660283C6 for ; Mon, 22 Jan 2018 17:05:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751170AbeAVRFA (ORCPT ); Mon, 22 Jan 2018 12:05:00 -0500 Received: from mx1.uni-rostock.de ([139.30.22.71]:51914 "EHLO mx1.uni-rostock.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751028AbeAVRE6 (ORCPT ); Mon, 22 Jan 2018 12:04:58 -0500 DKIM-Signature: v=1; c=relaxed/relaxed; d=uni-rostock.de; s=itmz-nsp; t=1516640697; bh=7WXzdcsi10s6VfAKCtilXWrRPtao106ZpSRnYZQJvbs=; h= "Subject:Subject:From:From:Date:Date:ReplyTo:ReplyTo:Cc:Cc:Message-Id:Message-Id"; a=rsa-sha256; b= Jyq/raQlEXkauxqeJ1e5gCyyB4v4tams37E163O3DnFXPrK+Ot5oBlyWJT79x5o4EFx2JsGAG1wFFe2Oz+IeLHyPbY7ga9a2wvBJP7HVoL1S845c2qD1P8DC989cgnet7yBY2emObwfgKccN3tMNvcPwM57lI0+XQUayn+Uh10Q= Received: from localhost.localdomain (139.30.201.113) by EMAIL2.uni-rostock.de (139.30.22.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1415.2; Mon, 22 Jan 2018 18:04:51 +0100 From: Benjamin Beichler To: CC: , Benjamin Beichler Subject: [PATCH v4 2/3] mac80211_hwsim: add nl_err_msg in hwsim_new_radio in netlink case Date: Mon, 22 Jan 2018 18:04:36 +0100 Message-ID: <20180122170437.14213-3-benjamin.beichler@uni-rostock.de> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180122170437.14213-1-benjamin.beichler@uni-rostock.de> References: <20180122170437.14213-1-benjamin.beichler@uni-rostock.de> MIME-Version: 1.0 X-Originating-IP: [139.30.201.113] X-ClientProxiedBy: email1.uni-rostock.de (139.30.22.81) To EMAIL2.uni-rostock.de (139.30.22.82) 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 Add a NL_ERR_MSG in case of creating a radio by a netlink message to give clear output to the creating process instead of creating only a debug message in kernel log. The same function is used for the creation while module load, so keep the old message, although it should never be thrown while load, because the module controls all mac addresses. Signed-off-by: Benjamin Beichler --- drivers/net/wireless/mac80211_hwsim.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index e9c92f70b97d..8baf61dea961 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2796,8 +2796,13 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, err = rhashtable_insert_fast(&hwsim_radios_rht, &data->rht, hwsim_rht_params); if (err < 0) { - pr_debug("mac80211_hwsim: radio index %d already present\n", - idx); + if(!info) + pr_debug("mac80211_hwsim: radio index %d already present\n", + idx); + else + GENL_SET_ERR_MSG(info,"perm addr already present"); + NL_SET_BAD_ATTR(info->extack, + info->attrs[HWSIM_ATTR_PERM_ADDR]); spin_unlock_bh(&hwsim_radio_lock); goto failed_final_insert; }