On Sat, Dec 04, 2021 at 01:02:02PM +0200, Luca Coelho wrote: > From: Mordechay Goodstein <mordechay.goodstein@xxxxxxxxx> > > commit 5283dd677e52af9db6fe6ad11b2f12220d519d0c upstream. > > In some very rare cases the init flow may fail. In many cases, this is > recoverable, so we can retry. Implement a loop to retry two more times > after the first attempt failed. > > This can happen in two different situations, namely during probe and > during mac80211 start. For the first case, a simple loop is enough. > For the second case, we need to add a flag to prevent mac80211 from > trying to restart it as well, leaving full control with the driver. > > Cc: <stable@xxxxxxxxxxxxxxx> > Signed-off-by: Mordechay Goodstein <mordechay.goodstein@xxxxxxxxx> > Signed-off-by: Luca Coelho <luciano.coelho@xxxxxxxxx> > Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx> > Link: https://lore.kernel.org/r/iwlwifi.20211110150132.57514296ecab.I52a0411774b700bdc7dedb124d8b59bf99456eb2@changeid > --- > drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 22 +++++++++++------ > drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 3 +++ > .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 24 ++++++++++++++++++- > drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 +++ > drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 3 +++ > 5 files changed, 47 insertions(+), 8 deletions(-) Both backports now queued up, thanks. greg k-h