netdev - Re: [linuxwifi] [PATCH] iwlwifi: Remove use of the deprecacted marco, PTR_RET for the function, iwl_mvm_get

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <1432533755.2957.0.camel@intel.com>
Date:	Mon, 25 May 2015 06:02:35 +0000
From:	"Grumbach, Emmanuel" <emmanuel.grumbach@...el.com>
To:	"xerofoify@...il.com" <xerofoify@...il.com>
CC:	"Coelho, Luciano" <luciano.coelho@...el.com>,
	"kvalo@...eaurora.org" <kvalo@...eaurora.org>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"linux-wireless@...r.kernel.org" <linux-wireless@...r.kernel.org>,
	"ilw@...ux.intel.com" <ilw@...ux.intel.com>,
	"Berg, Johannes" <johannes.berg@...el.com>
Subject: Re: [linuxwifi] [PATCH] iwlwifi: Remove use of the deprecacted
 marco, PTR_RET for the function, iwl_mvm_get_regdomain

On Sat, 2015-05-23 at 20:53 -0400, Nicholas Krause wrote:
> This removes the use of the two deprecated calls to the
> marco, PTR_RET in the function, iwl_mvm_get_regdomain
> and replaces them both with a call to the function,
> PTR_ERR_OR_ZERO.
> 
> Signed-off-by: Nicholas Krause <xerofoify@...il.com>

Applied in our internal tree after a few fixes to the commit message.
Will be pushed out with the regular process.
Thanks.

> ---
>  drivers/net/wireless/iwlwifi/mvm/mac80211.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
> index 40265b9..5fb2e8e 100644
> --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
> +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
> @@ -319,7 +319,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,
>  	resp = iwl_mvm_update_mcc(mvm, alpha2, src_id);
>  	if (IS_ERR_OR_NULL(resp)) {
>  		IWL_DEBUG_LAR(mvm, "Could not get update from FW %d\n",
> -			      PTR_RET(resp));
> +			      PTR_ERR_OR_ZERO(resp));
>  		goto out;
>  	}
>  
> @@ -335,7 +335,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,
>  	kfree(resp);
>  	if (IS_ERR_OR_NULL(regd)) {
>  		IWL_DEBUG_LAR(mvm, "Could not get parse update from FW %d\n",
> -			      PTR_RET(regd));
> +			      PTR_ERR_OR_ZERO(regd));
>  		goto out;
>  	}
>