Re: linux-next: net/wireless/wireless-current tree build warning

[Johannes Berg <johannes@sipsolutions.net>]

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

Stephen,

On Tue, 2009-12-01 at 13:35 +1100, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next build (x86_64 allmodconfig) produced this warning:
> 
> drivers/net/wireless/iwlwifi/iwl-tx.c: In function 'iwl_tx_agg_stop':
> drivers/net/wireless/iwlwifi/iwl-tx.c:1356: warning: passing argument 1 of 'ieee80211_stop_tx_ba_cb_irqsafe' from incompatible pointer type
> include/net/mac80211.h:2128: note: expected 'struct ieee80211_vif *' but argument is of type 'struct ieee80211_hw *'
> 
> Introduced by a bad merge (mine) between commit
> 827d42c9ac91ddd728e4f4a31fefb906ef2ceff7 ("mac80211: fix spurious delBA
> handling") form the wireless-current tree and commit
> c951ad3550ab40071bb0f222ba6125845769c08a ("mac80211: convert aggregation
> to operate on vifs/stas") from the net/wireless trees.  I didn't notice
> that the former had added a call to the function modified in the latter.
> 
> I applied the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 1 Dec 2009 13:19:44 +1100
> Subject: [PATCH] wireless: fix for mismerge
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/wireless/iwlwifi/iwl-tx.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
> index 58b132f..00da5e1 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-tx.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
> @@ -1353,7 +1353,7 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid)
>  	if (priv->stations[sta_id].tid[tid].agg.state ==
>  				IWL_EMPTYING_HW_QUEUE_ADDBA) {
>  		IWL_DEBUG_HT(priv, "AGG stop before setup done\n");
> -		ieee80211_stop_tx_ba_cb_irqsafe(priv->hw, ra, tid);
> +		ieee80211_stop_tx_ba_cb_irqsafe(priv->vif, ra, tid);

Perfect fixup, I had originally sent different versions of the patch for
different trees, but you couldn't know that, especially not since the
delba handling fix didn't (and won't) make it into wireless-next at all.

johannes

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