Re: [PATCH 1/1] mac80211: fix warning: unused variable invoke_tx_handlers

[Johannes Berg <johannes@sipsolutions.net>]

[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]

On Sat, 2008-06-28 at 03:15 +0300, Tomas Winkler wrote:
> This patch fixes warning: unused variable in invoke_tx_handlers
> when compiling without MAC80211_DEBUG option

Guess I haven't compiled like that in a long time.

> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>

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

> ---
>  net/mac80211/tx.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
> index 345d6ff..a8c1809 100644
> --- a/net/mac80211/tx.c
> +++ b/net/mac80211/tx.c
> @@ -1110,7 +1110,6 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
>   */
>  static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
>  {
> -	struct ieee80211_local *local = tx->local;
>  	struct sk_buff *skb = tx->skb;
>  	ieee80211_tx_handler *handler;
>  	ieee80211_tx_result res = TX_DROP;
> @@ -1123,7 +1122,7 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
>  	}
>  
>  	if (unlikely(res == TX_DROP)) {
> -		I802_DEBUG_INC(local->tx_handlers_drop);
> +		I802_DEBUG_INC(tx->local->tx_handlers_drop);
>  		dev_kfree_skb(skb);
>  		for (i = 0; i < tx->num_extra_frag; i++)
>  			if (tx->extra_frag[i])
> @@ -1131,7 +1130,7 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
>  		kfree(tx->extra_frag);
>  		return -1;
>  	} else if (unlikely(res == TX_QUEUED)) {
> -		I802_DEBUG_INC(local->tx_handlers_queued);
> +		I802_DEBUG_INC(tx->local->tx_handlers_queued);
>  		return -1;
>  	}
>  

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]