From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 23 Dec 2019 12:00:09 +0000 (-0500)
Subject: Merge 5.5-rc3 into staging-next
X-Git-Tag: block-5.6-2020-02-05~30^2~134
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=398d999f96bf8e02573b0c7e32896c7812393bc0;p=linux-block.git

Merge 5.5-rc3 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

398d999f96bf8e02573b0c7e32896c7812393bc0
diff --cc drivers/staging/wfx/sta.c
index 3296bc3521d5,471dd15b227f..9a61478d98f8
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@@ -1397,12 -1569,8 +1397,13 @@@ int wfx_add_interface(struct ieee80211_
  	INIT_WORK(&wvif->bss_params_work, wfx_bss_params_work);
  	INIT_WORK(&wvif->set_cts_work, wfx_set_cts_work);
  	INIT_WORK(&wvif->unjoin_work, wfx_unjoin_work);
 +	INIT_WORK(&wvif->tx_policy_upload_work, wfx_tx_policy_upload_work);
 +
 +	mutex_init(&wvif->scan_lock);
 +	init_completion(&wvif->scan_complete);
 +	INIT_WORK(&wvif->scan_work, wfx_hw_scan_work);
  
+ 	INIT_WORK(&wvif->tx_policy_upload_work, wfx_tx_policy_upload_work);
  	mutex_unlock(&wdev->conf_mutex);
  
  	hif_set_macaddr(wvif, vif->addr);