* linux-next: build warning after merge of the wireless-drivers-next tree
@ 2016-07-08 1:32 Stephen Rothwell
2016-07-08 1:35 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2016-07-08 1:32 UTC (permalink / raw)
To: Kalle Valo, linux-wireless, David Miller, netdev, Johannes Berg
Cc: linux-next, linux-kernel, Xinming Hu, Amitkumar Karwar,
Avraham Stern, David Spinadel, Assaf Krauss, Luca Coelho
Hi all,
After merging the wireless-drivers-next tree, today's linux-next build
(arm multi_v7_defconfig, x86_64 allmodconfig) produced this warning:
drivers/net/wireless/marvell/mwifiex/scan.c: In function 'mwifiex_cancel_scan':
drivers/net/wireless/marvell/mwifiex/scan.c:2031:44: warning: passing argument 2 of 'cfg80211_scan_done' makes pointer from integer without a cast [-Wint-conversion]
cfg80211_scan_done(priv->scan_request, 1);
^
In file included from include/net/mac80211.h:23:0,
from drivers/net/wireless/marvell/mwifiex/decl.h:30,
from drivers/net/wireless/marvell/mwifiex/scan.c:20:
include/net/cfg80211.h:4104:6: note: expected 'struct cfg80211_scan_info *' but argument is of type 'int'
void cfg80211_scan_done(struct cfg80211_scan_request *request,
^
Introduced by commit
a9c790ba23eb ("mwifiex: factor out mwifiex_cancel_scan")
interacting with commit
1d76250bd34a ("nl80211: support beacon report scanning")
from the net-next (and mac80211-next) tree.
This will need some merge fix patch ... please send me or Dave one.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: build warning after merge of the wireless-drivers-next tree
2016-07-08 1:32 linux-next: build warning after merge of the wireless-drivers-next tree Stephen Rothwell
@ 2016-07-08 1:35 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2016-07-08 1:35 UTC (permalink / raw)
To: Kalle Valo, linux-wireless, David Miller, netdev, Johannes Berg
Cc: linux-next, linux-kernel, Xinming Hu, Amitkumar Karwar,
Avraham Stern, David Spinadel, Assaf Krauss, Luca Coelho
Hi all,
On Fri, 8 Jul 2016 11:32:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the wireless-drivers-next tree, today's linux-next build
> (arm multi_v7_defconfig, x86_64 allmodconfig) produced this warning:
>
> drivers/net/wireless/marvell/mwifiex/scan.c: In function 'mwifiex_cancel_scan':
> drivers/net/wireless/marvell/mwifiex/scan.c:2031:44: warning: passing argument 2 of 'cfg80211_scan_done' makes pointer from integer without a cast [-Wint-conversion]
> cfg80211_scan_done(priv->scan_request, 1);
> ^
> In file included from include/net/mac80211.h:23:0,
> from drivers/net/wireless/marvell/mwifiex/decl.h:30,
> from drivers/net/wireless/marvell/mwifiex/scan.c:20:
> include/net/cfg80211.h:4104:6: note: expected 'struct cfg80211_scan_info *' but argument is of type 'int'
> void cfg80211_scan_done(struct cfg80211_scan_request *request,
> ^
>
> Introduced by commit
>
> a9c790ba23eb ("mwifiex: factor out mwifiex_cancel_scan")
>
> interacting with commit
>
> 1d76250bd34a ("nl80211: support beacon report scanning")
>
> from the net-next (and mac80211-next) tree.
>
> This will need some merge fix patch ... please send me or Dave one.
Of course, this is the conflict I reported against the mac80211-next
tree yesterday (the memory fades :-)) ... I will move the merge fix
patch from that tree to this one.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-08 1:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-08 1:32 linux-next: build warning after merge of the wireless-drivers-next tree Stephen Rothwell
2016-07-08 1:35 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).