From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Johannes Berg <johannes@sipsolutions•net>,
Kalle Valo <kvalo@codeaurora•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Xinming Hu <huxm@marvell•com>,
Avraham Stern <avraham.stern@intel•com>,
David Spinadel <david.spinadel@intel•com>,
Assaf Krauss <assaf.krauss@intel•com>,
Luca Coelho <luciano.coelho@intel•com>,
Amitkumar Karwar <akarwar@marvell•com>
Subject: linux-next: manual merge of the mac80211-next tree with the wireless-drivers-next tree
Date: Thu, 7 Jul 2016 11:56:28 +1000 [thread overview]
Message-ID: <20160707115628.7fdac327@canb.auug.org.au> (raw)
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
next reply other threads:[~2016-07-07 1:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 1:56 Stephen Rothwell [this message]
2016-07-07 5:49 ` linux-next: manual merge of the mac80211-next tree with the wireless-drivers-next tree Coelho, Luciano
2016-07-07 16:10 ` Kalle Valo
2016-07-08 0:34 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160707115628.7fdac327@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akarwar@marvell$(echo .)com \
--cc=assaf.krauss@intel$(echo .)com \
--cc=avraham.stern@intel$(echo .)com \
--cc=david.spinadel@intel$(echo .)com \
--cc=huxm@marvell$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=kvalo@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luciano.coelho@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox