]>
Commit | Line | Data |
---|---|---|
a0402406 GKH |
1 | From a69b03e941abae00380fc6bc1877fb797a1b31e6 Mon Sep 17 00:00:00 2001 |
2 | From: John W. Linville <linville@tuxdriver.com> | |
3 | Date: Mon, 14 Jun 2010 14:30:25 -0400 | |
4 | Subject: iwlwifi: cancel scan watchdog in iwl_bg_abort_scan | |
5 | ||
6 | From: John W. Linville <linville@tuxdriver.com> | |
7 | ||
8 | commit a69b03e941abae00380fc6bc1877fb797a1b31e6 upstream. | |
9 | ||
10 | Avoids this: | |
11 | ||
12 | WARNING: at net/mac80211/scan.c:312 ieee80211_scan_completed+0x5f/0x1f1 | |
13 | [mac80211]() | |
14 | Hardware name: Latitude E5400 | |
15 | Modules linked in: aes_x86_64 aes_generic fuse ipt_MASQUERADE iptable_nat | |
16 | nf_nat rfcomm sco bridge stp llc bnep l2cap sunrpc cpufreq_ondemand | |
17 | acpi_cpufreq freq_table xt_physdev ip6t_REJECT nf_conntrack_ipv6 | |
18 | ip6table_filter ip6_tables ipv6 kvm_intel kvm uinput arc4 ecb | |
19 | snd_hda_codec_intelhdmi snd_hda_codec_idt snd_hda_intel iwlagn snd_hda_codec | |
20 | snd_hwdep snd_seq snd_seq_device iwlcore snd_pcm dell_wmi sdhci_pci sdhci | |
21 | iTCO_wdt tg3 dell_laptop mmc_core i2c_i801 wmi mac80211 snd_timer | |
22 | iTCO_vendor_support btusb joydev dcdbas cfg80211 bluetooth snd soundcore | |
23 | microcode rfkill snd_page_alloc firewire_ohci firewire_core crc_itu_t | |
24 | yenta_socket rsrc_nonstatic i915 drm_kms_helper drm i2c_algo_bit i2c_core video | |
25 | output [last unloaded: scsi_wait_scan] | |
26 | Pid: 979, comm: iwlagn Tainted: G W 2.6.33.3-85.fc13.x86_64 #1 | |
27 | Call Trace: | |
28 | [<ffffffff8104b558>] warn_slowpath_common+0x77/0x8f | |
29 | [<ffffffff8104b57f>] warn_slowpath_null+0xf/0x11 | |
30 | [<ffffffffa01bb7d9>] ieee80211_scan_completed+0x5f/0x1f1 [mac80211] | |
31 | [<ffffffffa02a23f0>] iwl_bg_scan_completed+0xbb/0x17a [iwlcore] | |
32 | [<ffffffff81060d3d>] worker_thread+0x1a4/0x232 | |
33 | [<ffffffffa02a2335>] ? iwl_bg_scan_completed+0x0/0x17a [iwlcore] | |
34 | [<ffffffff81064817>] ? autoremove_wake_function+0x0/0x34 | |
35 | [<ffffffff81060b99>] ? worker_thread+0x0/0x232 | |
36 | [<ffffffff810643c7>] kthread+0x7a/0x82 | |
37 | [<ffffffff8100a924>] kernel_thread_helper+0x4/0x10 | |
38 | [<ffffffff8106434d>] ? kthread+0x0/0x82 | |
39 | [<ffffffff8100a920>] ? kernel_thread_helper+0x0/0x10 | |
40 | ||
41 | Reported here: | |
42 | ||
43 | https://bugzilla.redhat.com/show_bug.cgi?id=590436 | |
44 | ||
45 | Signed-off-by: John W. Linville <linville@tuxdriver.com> | |
46 | Reported-by: Mihai Harpau <mishu@piatafinanciara.ro> | |
47 | Acked-by: Reinette Chatre <reinette.chatre@intel.com> | |
48 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
49 | ||
50 | --- | |
51 | drivers/net/wireless/iwlwifi/iwl-scan.c | 1 + | |
52 | 1 file changed, 1 insertion(+) | |
53 | ||
54 | --- a/drivers/net/wireless/iwlwifi/iwl-scan.c | |
55 | +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |
56 | @@ -799,6 +799,7 @@ void iwl_bg_abort_scan(struct work_struc | |
57 | ||
58 | mutex_lock(&priv->mutex); | |
59 | ||
60 | + cancel_delayed_work_sync(&priv->scan_check); | |
61 | set_bit(STATUS_SCAN_ABORTING, &priv->status); | |
62 | iwl_send_scan_abort(priv); | |
63 |