From: Luca Coelho <luca@coelho.fi>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org,
Johannes Berg <johannes.berg@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: [PATCH 06/15] mac80211: call drv_ibss_join() on restart
Date: Wed, 6 Feb 2019 13:17:12 +0200 [thread overview]
Message-ID: <20190206111721.29283-7-luca@coelho.fi> (raw)
In-Reply-To: <20190206111721.29283-1-luca@coelho.fi>
From: Johannes Berg <johannes.berg@intel.com>
If a driver does any significant activity in its ibss_join method,
then it will very well expect that to be called during restart,
before any stations are added. Do that.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
net/mac80211/util.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 314aacdf8c19..0df71f1b3cac 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -5,7 +5,7 @@
* Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
* Copyright 2013-2014 Intel Mobile Communications GmbH
* Copyright (C) 2015-2017 Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -2150,6 +2150,10 @@ int ieee80211_reconfig(struct ieee80211_local *local)
case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_MONITOR:
break;
+ case NL80211_IFTYPE_ADHOC:
+ if (sdata->vif.bss_conf.ibss_joined)
+ WARN_ON(drv_join_ibss(local, sdata));
+ /* fall through */
default:
ieee80211_reconfig_stations(sdata);
/* fall through */
--
2.20.1
next prev parent reply other threads:[~2019-02-06 11:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 11:17 [PATCH 00/15] cfg80211/mac80211 patches from our internal tree 2019-02-06 Luca Coelho
2019-02-06 11:17 ` [PATCH 01/15] cfg80211: pmsr: record netlink port ID Luca Coelho
2019-02-06 11:17 ` [PATCH 02/15] nl80211: Fix FTM per burst maximum value Luca Coelho
2019-02-06 11:17 ` [PATCH 03/15] mac80211: support max channel switch time element Luca Coelho
2019-02-06 11:17 ` [PATCH 04/15] mac80211: abort CSA if beacon does not include CSA IEs Luca Coelho
2019-02-06 11:17 ` [PATCH 05/15] radiotap: add 0-length PSDU "not captured" type Luca Coelho
2019-02-06 11:17 ` Luca Coelho [this message]
2019-02-06 11:17 ` [PATCH 07/15] mac80211: fix position of vendor_data read Luca Coelho
2019-02-06 11:17 ` [PATCH 08/15] cfg80211: prevent speculation on cfg80211_classify8021d() return Luca Coelho
2019-02-06 11:17 ` [PATCH 09/15] mac80211: notify driver on subsequent CSA beacons Luca Coelho
2019-02-06 11:17 ` [PATCH 10/15] mac80211: allow CSA to self with immediate quiet Luca Coelho
2019-02-06 11:17 ` [PATCH 11/15] mac80211: ignore quiet mode in probe Luca Coelho
2019-02-06 11:17 ` [PATCH 12/15] mac80211: shorten debug print to avoid warning Luca Coelho
2019-02-11 14:52 ` Johannes Berg
2019-02-11 16:37 ` Luca Coelho
2019-02-06 11:17 ` [PATCH 13/15] cfg80211: allow sending vendor events unicast Luca Coelho
2019-02-06 11:17 ` [PATCH 14/15] mac80211: update HE IEs to D3.3 Luca Coelho
2019-02-06 11:17 ` [PATCH 15/15] mac80211: Fix Tx aggregation session tear down with ITXQs Luca Coelho
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=20190206111721.29283-7-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).