>From internal-wifi-devel-bounces@linux.intel.com Fri Sep 9 04:58:25 2011 Received: from fmsmsx103.amr.corp.intel.com (10.19.9.34) by orsmsx606.amr.corp.intel.com (10.22.226.128) with Microsoft SMTP Server (TLS) id 8.2.255.0; Fri, 9 Sep 2011 04:58:25 -0700 Received: from rrsmsx603.amr.corp.intel.com (10.31.0.57) by FMSMSX103.amr.corp.intel.com (10.19.9.34) with Microsoft SMTP Server (TLS) id 14.1.323.3; Fri, 9 Sep 2011 04:58:25 -0700 Received: from fmsmga002.fm.intel.com (10.253.24.26) by rrsmsx603-2.rr.intel.com (10.31.0.37) with Microsoft SMTP Server id 8.2.255.0; Fri, 9 Sep 2011 05:58:08 -0600 Received: from linux.jf.intel.com (HELO linux.intel.com) ([10.23.219.25]) by fmsmga002.fm.intel.com with ESMTP; 09 Sep 2011 04:58:00 -0700 Received: from linux.intel.com (linux.intel.com [127.0.0.1]) by linux.intel.com (Postfix) with ESMTP id C03326A408D; Fri, 9 Sep 2011 04:57:58 -0700 (PDT) Received: from fmsmga001.fm.intel.com (fmsmga001.fm.intel.com [10.253.24.23]) by linux.intel.com (Postfix) with ESMTP id 00B966A408D for ; Fri, 9 Sep 2011 04:57:57 -0700 (PDT) Received: from unknown (HELO [10.252.120.31]) ([10.252.120.31]) by fmsmga001.fm.intel.com with ESMTP; 09 Sep 2011 04:57:58 -0700 From: "Berg, Johannes" To: "internal-wifi-devel@linux.intel.com" Sender: "internal-wifi-devel-bounces@linux.intel.com" Date: Fri, 9 Sep 2011 04:57:57 -0700 Subject: [Internal-wifi-devel] [PATCH] iwlagn: fix command queue timeout Thread-Topic: [Internal-wifi-devel] [PATCH] iwlagn: fix command queue timeout Thread-Index: Acxu58fdpqygpyL/TTGoLjjdmkOmog== Message-ID: <1315569477.17050.5.camel@jlt3.sipsolutions.net> List-Help: List-Subscribe: , List-Unsubscribe: , Accept-Language: en-US Content-Language: en-US X-MS-Exchange-Organization-AuthAs: Internal X-MS-Exchange-Organization-AuthMechanism: 10 X-MS-Exchange-Organization-AuthSource: rrsmsx603.amr.corp.intel.com X-MS-Has-Attach: X-Auto-Response-Suppress: All X-MS-TNEF-Correlator: x-ironport-av: E=Sophos;i="4.68,355,1312182000"; d="scan'208";a="49613953" x-extloop1: 1 x-extloopcount2: 2 from 10.23.219.25 errors-to: internal-wifi-devel-bounces@linux.intel.com list-id: internal wifi development mailing list list-post: list-archive: x-original-to: internal-wifi-devel@linux.intel.com delivered-to: internal-wifi-devel@localhost.localdomain x-beenthere: internal-wifi-devel@linux.intel.com x-mailman-version: 2.1.5 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 X-Evolution-Source: imap://wwguy@imapmail.intel.com/ Content-Transfer-Encoding: 8bit From: Johannes Berg If the command queue is constantly busy, which can happen in P2P, the hangcheck timer will frequently find a command in it and will eventually reset the device because nothing sets the timestamp for this queue when commands are processed. Fix this by setting the timestamp when a command completes. Signed-off-by: Johannes Berg SIgned-off-by: Wey-Yi Guy --- It's possible this needs to go to stable? drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c 2011-09-09 13:55:03.000000000 +0200 +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c 2011-09-09 13:55:26.000000000 +0200 @@ -928,6 +928,8 @@ void iwl_tx_cmd_complete(struct iwl_tran cmd = txq->cmd[cmd_index]; meta = &txq->meta[cmd_index]; + txq->time_stamp = jiffies; + iwlagn_unmap_tfd(trans, meta, &txq->tfds[index], DMA_BIDIRECTIONAL); _______________________________________________ internal-wifi-devel mailing list internal-wifi-devel@linux.intel.com http://linux.intel.com/mailman/listinfo/internal-wifi-devel