* linux-next: net/wireless/wireless-current tree build warning
@ 2009-12-01 2:35 Stephen Rothwell
2009-12-01 9:14 ` Johannes Berg
2009-12-07 13:15 ` Johannes Berg
0 siblings, 2 replies; 8+ messages in thread
From: Stephen Rothwell @ 2009-12-01 2:35 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Johannes Berg, David S. Miller
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);
priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;
return 0;
}
--
1.6.5.3
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: linux-next: net/wireless/wireless-current tree build warning
2009-12-01 2:35 linux-next: net/wireless/wireless-current tree build warning Stephen Rothwell
@ 2009-12-01 9:14 ` Johannes Berg
2009-12-07 13:15 ` Johannes Berg
1 sibling, 0 replies; 8+ messages in thread
From: Johannes Berg @ 2009-12-01 9:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: John W. Linville, linux-next, linux-kernel, David S. Miller
[-- 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 --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: net/wireless/wireless-current tree build warning
2009-12-01 2:35 linux-next: net/wireless/wireless-current tree build warning Stephen Rothwell
2009-12-01 9:14 ` Johannes Berg
@ 2009-12-07 13:15 ` Johannes Berg
2009-12-07 22:20 ` Stephen Rothwell
1 sibling, 1 reply; 8+ messages in thread
From: Johannes Berg @ 2009-12-07 13:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: John W. Linville, linux-next, linux-kernel, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
John,
> 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 *'
This has now snuck into wireless-testing as well.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: net/wireless/wireless-current tree build warning
2009-12-07 13:15 ` Johannes Berg
@ 2009-12-07 22:20 ` Stephen Rothwell
2009-12-07 22:32 ` John W. Linville
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2009-12-07 22:20 UTC (permalink / raw)
To: David S. Miller, John W. Linville; +Cc: Johannes Berg, linux-next, linux-kernel
Hi Dave, John,
On Mon, 07 Dec 2009 14:15:54 +0100 Johannes Berg <johannes@sipsolutions•net> wrote:
>
> > 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 *'
>
> This has now snuck into wireless-testing as well.
Johannes is right, the patch I posted need to be part of the wireless
tree once the wireless-current tree was merged into it. Now this patch
(reposted below) is needed in the wireless and net trees ...
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);
priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;
return 0;
}
--
1.6.5.3
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: linux-next: net/wireless/wireless-current tree build warning
2009-12-07 22:20 ` Stephen Rothwell
@ 2009-12-07 22:32 ` John W. Linville
2009-12-07 22:59 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: John W. Linville @ 2009-12-07 22:32 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David S. Miller, Johannes Berg, linux-next, linux-kernel
On Tue, Dec 08, 2009 at 09:20:57AM +1100, Stephen Rothwell wrote:
> Hi Dave, John,
>
> On Mon, 07 Dec 2009 14:15:54 +0100 Johannes Berg <johannes@sipsolutions•net> wrote:
> >
> > > 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 *'
> >
> > This has now snuck into wireless-testing as well.
>
> Johannes is right, the patch I posted need to be part of the wireless
> tree once the wireless-current tree was merged into it. Now this patch
> (reposted below) is needed in the wireless and net trees ...
I've just merged such a patch...thanks!
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver•com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: net/wireless/wireless-current tree build warning
2009-12-07 22:32 ` John W. Linville
@ 2009-12-07 22:59 ` Stephen Rothwell
2009-12-07 23:19 ` David Miller
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2009-12-07 22:59 UTC (permalink / raw)
To: John W. Linville; +Cc: David S. Miller, Johannes Berg, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
Hi John,
On Mon, 7 Dec 2009 17:32:37 -0500 "John W. Linville" <linville@tuxdriver•com> wrote:
>
> I've just merged such a patch...thanks!
Ah, thanks. I will still apply it as a merge fix for the net tree until
Dave merges your tree again.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: net/wireless/wireless-current tree build warning
2009-12-07 22:59 ` Stephen Rothwell
@ 2009-12-07 23:19 ` David Miller
2009-12-08 0:20 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: David Miller @ 2009-12-07 23:19 UTC (permalink / raw)
To: sfr; +Cc: linville, johannes, linux-next, linux-kernel
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 8 Dec 2009 09:59:31 +1100
> Hi John,
>
> On Mon, 7 Dec 2009 17:32:37 -0500 "John W. Linville" <linville@tuxdriver•com> wrote:
>>
>> I've just merged such a patch...thanks!
>
> Ah, thanks. I will still apply it as a merge fix for the net tree until
> Dave merges your tree again.
I haven't touched my tree in a few days since I'm still
waiting for Linus to pull my tree in.
Once that happens we'll sort out these merge issues.
Thanks!
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: net/wireless/wireless-current tree build warning
2009-12-07 23:19 ` David Miller
@ 2009-12-08 0:20 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2009-12-08 0:20 UTC (permalink / raw)
To: David Miller; +Cc: linville, johannes, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
Hi Dave,
On Mon, 07 Dec 2009 15:19:18 -0800 (PST) David Miller <davem@davemloft•net> wrote:
>
> I haven't touched my tree in a few days since I'm still
> waiting for Linus to pull my tree in.
>
> Once that happens we'll sort out these merge issues.
That's fine, thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2009-12-08 0:20 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-01 2:35 linux-next: net/wireless/wireless-current tree build warning Stephen Rothwell
2009-12-01 9:14 ` Johannes Berg
2009-12-07 13:15 ` Johannes Berg
2009-12-07 22:20 ` Stephen Rothwell
2009-12-07 22:32 ` John W. Linville
2009-12-07 22:59 ` Stephen Rothwell
2009-12-07 23:19 ` David Miller
2009-12-08 0:20 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox