[PATCH] iwlwifi: avoid "Error sending TX power (-5)"

[PATCH] iwlwifi: avoid "Error sending TX power (-5)"

[Stanislaw Gruszka]

We can have this error message when loading or unloading module, when
device is not marked as ready, but we want to set tx power from
commit_rxon. Perhaps something better should be done like call
lib->send_tx_power() directly from commit_rxon, but for now just
do not return error.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
 drivers/net/wireless/iwlwifi/iwl-core.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index c884ed3..3f826e5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1169,8 +1169,13 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
 		return -EINVAL;
 	}
 
+	/*
+	 * (FIXME ?) Do not report error, we can be called through commit_rxon
+	 * from iwl_set_mode() and iwl_bg_alive_start() when device is not
+	 * marked as ready
+	 */
 	if (!iwl_is_ready_rf(priv))
-		return -EIO;
+		return 0;
 
 	/* scan complete use tx_power_next, need to be updated */
 	priv->tx_power_next = tx_power;
-- 
1.7.1

Re: [PATCH] iwlwifi: avoid "Error sending TX power (-5)"

[Johannes Berg]

On Wed, 2010-11-24 at 11:37 +0100, Stanislaw Gruszka wrote:
> We can have this error message when loading or unloading module, when
> device is not marked as ready, but we want to set tx power from
> commit_rxon. Perhaps something better should be done like call
> lib->send_tx_power() directly from commit_rxon, but for now just
> do not return error.

I think this actually fixes it, as opposed to hiding it:

http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commitdiff;h=9e2e7422d059f9b98c3a0810df92a1ff660ade2f

johannes

Re: [PATCH] iwlwifi: avoid "Error sending TX power (-5)"

[Stanislaw Gruszka]

On Wed, Nov 24, 2010 at 11:44:12AM +0100, Johannes Berg wrote:
> On Wed, 2010-11-24 at 11:37 +0100, Stanislaw Gruszka wrote:
> > We can have this error message when loading or unloading module, when
> > device is not marked as ready, but we want to set tx power from
> > commit_rxon. Perhaps something better should be done like call
> > lib->send_tx_power() directly from commit_rxon, but for now just
> > do not return error.
> 
> I think this actually fixes it, as opposed to hiding it:
> 
> http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commitdiff;h=9e2e7422d059f9b98c3a0810df92a1ff660ade2f

Yes.

Thanks
Stanislaw 

Re: [PATCH] iwlwifi: avoid "Error sending TX power (-5)"

[Stanislaw Gruszka]

On Wed, Nov 24, 2010 at 02:04:03PM +0100, Stanislaw Gruszka wrote:
> On Wed, Nov 24, 2010 at 11:44:12AM +0100, Johannes Berg wrote:
> > On Wed, 2010-11-24 at 11:37 +0100, Stanislaw Gruszka wrote:
> > > We can have this error message when loading or unloading module, when
> > > device is not marked as ready, but we want to set tx power from
> > > commit_rxon. Perhaps something better should be done like call
> > > lib->send_tx_power() directly from commit_rxon, but for now just
> > > do not return error.
> > 
> > I think this actually fixes it, as opposed to hiding it:
> > 
> > http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commitdiff;h=9e2e7422d059f9b98c3a0810df92a1ff660ade2f
> 
> Yes.

Not fully, message disappears at start, but not when module
is unloaded.

Stanislaw 

Re: [PATCH] iwlwifi: avoid "Error sending TX power (-5)"

[Guy, Wey-Yi]

Hi Stanislaw,

On Wed, 2010-11-24 at 06:11 -0800, Stanislaw Gruszka wrote:
> On Wed, Nov 24, 2010 at 02:04:03PM +0100, Stanislaw Gruszka wrote:
> > On Wed, Nov 24, 2010 at 11:44:12AM +0100, Johannes Berg wrote:
> > > On Wed, 2010-11-24 at 11:37 +0100, Stanislaw Gruszka wrote:
> > > > We can have this error message when loading or unloading module, when
> > > > device is not marked as ready, but we want to set tx power from
> > > > commit_rxon. Perhaps something better should be done like call
> > > > lib->send_tx_power() directly from commit_rxon, but for now just
> > > > do not return error.
> > > 
> > > I think this actually fixes it, as opposed to hiding it:
> > > 
> > > http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commitdiff;h=9e2e7422d059f9b98c3a0810df92a1ff660ade2f
> > 
> > Yes.
> 
> Not fully, message disappears at start, but not when module
> is unloaded.
> 
you are correct, I miss that. Would you like to address that? or I can
fix it

Thanks
Wey

Re: [PATCH] iwlwifi: avoid "Error sending TX power (-5)"

[Stanislaw Gruszka]

Hi

On Wed, Nov 24, 2010 at 07:41:20AM -0800, Guy, Wey-Yi wrote:
> > Not fully, message disappears at start, but not when module
> > is unloaded.
> > 
> you are correct, I miss that. Would you like to address that? or I can
> fix it

Please fix it, I could again do some crappy workaround instead
of proper fix.

Stanislaw