| Message ID | 1286317292-10679-1-git-send-email-florian@mickler.org |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Florian On Wed, Oct 06, 2010 at 12:21:32AM +0200, Florian Mickler wrote: > Stanislaw Gruszka pointed out, that commit > "iwl3945: queue the right work if the scan needs to be aborted" > has an awkward definition of "right". Specifically the abort_scan work > doesn't notify the generic wireless stack that the scan was aborted. > > In order to get rid of the warning in bug > https://bugzilla.kernel.org/show_bug.cgi?id=17722 > we inform ieee80211_scan_completed that we are aborting > the scan by setting the apropriate status bit in request_scan and > pass it into ieee80211_scan_completed. > > Signed-off-by: Florian Mickler <florian@mickler.org> > --- > > Hi John! > > Here is the fix that Stanislaw described. > (Yes, it is in a brown paper bag.) Please wait for him to review this. > > Another option would be to just revert my previous patch and live with the > warning until the scanning rework hit's mainline. This patch is not so bad, but better would be just return value from {iwlagn,iwl3945}_request_scan instead of queuing anything. I will prepare patch(s) today or tomorrow. Stanislaw -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 8fd00a6..2d26767 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c @@ -1410,8 +1410,10 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) */ clear_bit(STATUS_SCAN_HW, &priv->status); clear_bit(STATUS_SCANNING, &priv->status); + /* inform mac80211 scan aborted */ - queue_work(priv->workqueue, &priv->abort_scan); + set_bit(STATUS_SCAN_ABORTING, &priv->status); + queue_work(priv->workqueue, &priv->scan_completed); } int iwlagn_manage_ibss_station(struct iwl_priv *priv, diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index a4b3663..fedf384 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -552,8 +552,10 @@ void iwl_bg_scan_completed(struct work_struct *work) * into driver again into functions that will attempt to take * mutex. */ - if (!internal) - ieee80211_scan_completed(priv->hw, false); + if (!internal) { + bool aborted = test_bit(STATUS_SCAN_ABORTING, &priv->status); + ieee80211_scan_completed(priv->hw, aborted); + } } EXPORT_SYMBOL(iwl_bg_scan_completed); diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index d31661c..da10588 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -3018,7 +3018,8 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) clear_bit(STATUS_SCANNING, &priv->status); /* inform mac80211 scan aborted */ - queue_work(priv->workqueue, &priv->abort_scan); + set_bit(STATUS_SCAN_ABORTING, &priv->status); + queue_work(priv->workqueue, &priv->scan_completed); } static void iwl3945_bg_restart(struct work_struct *data)
Stanislaw Gruszka pointed out, that commit "iwl3945: queue the right work if the scan needs to be aborted" has an awkward definition of "right". Specifically the abort_scan work doesn't notify the generic wireless stack that the scan was aborted. In order to get rid of the warning in bug https://bugzilla.kernel.org/show_bug.cgi?id=17722 we inform ieee80211_scan_completed that we are aborting the scan by setting the apropriate status bit in request_scan and pass it into ieee80211_scan_completed. Signed-off-by: Florian Mickler <florian@mickler.org> --- Hi John! Here is the fix that Stanislaw described. (Yes, it is in a brown paper bag.) Please wait for him to review this. Another option would be to just revert my previous patch and live with the warning until the scanning rework hit's mainline. Regards, Flo drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 4 +++- drivers/net/wireless/iwlwifi/iwl-scan.c | 6 ++++-- drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-)