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

[Coelho, Luciano]

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@xxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxx>
> ---
> Â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.