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

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

[Stephen Rothwell]

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@canb.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@canb.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;
 			}
 		}
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

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@canb.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@canb.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.

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

[Kalle Valo]

(Adding linux-wireless)

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> 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.

Thanks. When I send my pull request to Dave I'll let him know about this
conflict and propose to use your patch as the resolution.

Stephen, if it's not too much trouble for you it would be good to CC
linux-wireless on wireless related problems. Not everyone follow lkml
(or linux-next).

-- 
Kalle Valo

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

[Stephen Rothwell]

Hi Kalle,

On Thu, 07 Jul 2016 19:10:24 +0300 Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Stephen, if it's not too much trouble for you it would be good to CC
> linux-wireless on wireless related problems. Not everyone follow lkml
> (or linux-next).

I have added linux-wireless@vger.kernel.org as a contact for the
wireless-drivers and wireless-drivers-next trees.

-- 
Cheers,
Stephen Rothwell