ACK -- this is the proper fix-up.
On Wed, Apr 29, 2009 at 01:51:18PM +1000, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-scan.c between commit
> 74aa9be0ea0ffeb233f45c39f3cf594b68bbbb89 ("iwlwifi: notify on scan
> completion even when shutting down") from the wireless-current tree and
> commit 1ecf9fc1317f8df91eb1d74360f408558d657478 ("iwlwifi: improve scan
> support") from the net tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc drivers/net/wireless/iwlwifi/iwl-scan.c
> index e7c65c4,799f5eb..0000000
> --- a/drivers/net/wireless/iwlwifi/iwl-scan.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
> @@@ -925,11 -814,12 +814,12 @@@ void iwl_bg_scan_completed(struct work_
>
> IWL_DEBUG_SCAN(priv, "SCAN complete scan\n");
>
> - if (test_bit(STATUS_EXIT_PENDING, &priv->status))
> - return;
> -
> + priv->scan_request = NULL;
> ieee80211_scan_completed(priv->hw, false);
>
> + if (test_bit(STATUS_EXIT_PENDING, &priv->status))
> + return;
> +
> /* Since setting the TXPOWER may have been deferred while
> * performing the scan, fire one off */
> mutex_lock(&priv->mutex);
>
--
John W. Linville Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
