diff mbox

[-next,1/2] iwlwifi: fix double assign in iwl_start_tx_ba_trans_ready()

Message ID 20110831063742.GC3705@shale.localdomain (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Dan Carpenter Aug. 31, 2011, 6:37 a.m. UTC
"vif" is assigned twice.  We can remove the first one.

This silences a Smatch warning that "ctx" could be one step past the
end of the priv->contexts[] array.

Signed-off-by: Dan Carpenter <error27@gmail.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Johannes Berg Aug. 31, 2011, 6:41 a.m. UTC | #1
On Wed, 2011-08-31 at 09:37 +0300, Dan Carpenter wrote:
> "vif" is assigned twice.  We can remove the first one.
> 
> This silences a Smatch warning that "ctx" could be one step past the
> end of the priv->contexts[] array.

Good catch.

Reviewed-by: Johannes Berg <johannes@sipsolutions.net>

> Signed-off-by: Dan Carpenter <error27@gmail.com>
> 
> diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
> index 20dd1a5..72b9203 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-core.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-core.c
> @@ -1842,7 +1842,7 @@ void iwl_start_tx_ba_trans_ready(struct iwl_priv *priv,
>  				 enum iwl_rxon_context_id ctx,
>  				 u8 sta_id, u8 tid)
>  {
> -	struct ieee80211_vif *vif = priv->contexts[ctx].vif;
> +	struct ieee80211_vif *vif;
>  	u8 *addr = priv->stations[sta_id].sta.sta.addr;
>  
>  	if (ctx == NUM_IWL_RXON_CTX)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Guy, Wey-Yi W Aug. 31, 2011, 9:34 a.m. UTC | #2
On Tue, 2011-08-30 at 23:41 -0700, Johannes Berg wrote:
> On Wed, 2011-08-31 at 09:37 +0300, Dan Carpenter wrote:
> > "vif" is assigned twice.  We can remove the first one.
> > 
> > This silences a Smatch warning that "ctx" could be one step past the
> > end of the priv->contexts[] array.
> 
> Good catch.
> 
> Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
> 
> > Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> > 

Thanks
Wey

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 20dd1a5..72b9203 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1842,7 +1842,7 @@  void iwl_start_tx_ba_trans_ready(struct iwl_priv *priv,
 				 enum iwl_rxon_context_id ctx,
 				 u8 sta_id, u8 tid)
 {
-	struct ieee80211_vif *vif = priv->contexts[ctx].vif;
+	struct ieee80211_vif *vif;
 	u8 *addr = priv->stations[sta_id].sta.sta.addr;
 
 	if (ctx == NUM_IWL_RXON_CTX)