linux-kernel - Re: linux-next: manual merge of the mac80211-next tree with the wireless-drivers-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 7 Jul 2016 05:49:09 +0000
From:	"Coelho, Luciano" <luciano.coelho@...el.com>
To:	"sfr@...b.auug.org.au" <sfr@...b.auug.org.au>,
	"kvalo@...eaurora.org" <kvalo@...eaurora.org>,
	"johannes@...solutions.net" <johannes@...solutions.net>
CC:	"Krauss, Assaf" <assaf.krauss@...el.com>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"huxm@...vell.com" <huxm@...vell.com>,
	"Stern, Avraham" <avraham.stern@...el.com>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"Spinadel, David" <david.spinadel@...el.com>,
	"akarwar@...vell.com" <akarwar@...vell.com>
Subject: Re: linux-next: manual merge of the mac80211-next tree with the
 wireless-drivers-next tree

On Thu, 2016-07-07 at 11:56 +1000, Stephen Rothwell wrote:
> Hi Johannes,
> 
> Today's linux-next merge of the mac80211-next tree got a conflict in:
> 
>   drivers/net/wireless/marvell/mwifiex/cmdevt.c
> 
> between commit:
> 
>   a9c790ba23eb ("mwifiex: factor out mwifiex_cancel_scan")
> 
> from the wireless-drivers-next tree and commit:
> 
>   1d76250bd34a ("nl80211: support beacon report scanning")
> 
> from the mac80211-next tree.
> 
> I fixed it up (I used the wireless-drivers-next tree version of this
> file
> and then added the following merge fix patch) and can carry the fix
> as
> necessary. This is now fixed as far as linux-next is concerned, but
> any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to
> consider
> cooperating with the maintainer of the conflicting tree to minimise
> any
> particularly complex conflicts.
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Thu, 7 Jul 2016 11:51:35 +1000
> Subject: [PATCH] mwifiex: fixup for "nl80211: support beacon report
> scanning"
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/net/wireless/marvell/mwifiex/scan.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c
> b/drivers/net/wireless/marvell/mwifiex/scan.c
> index 4d21ca9744c1..ed3de0754a08 100644
> --- a/drivers/net/wireless/marvell/mwifiex/scan.c
> +++ b/drivers/net/wireless/marvell/mwifiex/scan.c
> @@ -2026,9 +2026,13 @@ void mwifiex_cancel_scan(struct
> mwifiex_adapter *adapter)
>  			if (!priv)
>  				continue;
>  			if (priv->scan_request) {
> +				struct cfg80211_scan_info info = {
> +					.aborted = true,
> +				};
> +
>  				mwifiex_dbg(adapter, INFO,
>  					    "info: aborting
> scan\n");
> -				cfg80211_scan_done(priv-
> >scan_request, 1);
> +				cfg80211_scan_done(priv-
> >scan_request, &info);
>  				priv->scan_request = NULL;
>  			}
>  		}

The fix looks good to me.  Thanks!

--
Luca.