From patchwork Thu Feb 4 13:33:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 76979 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o14DYJrn008104 for ; Thu, 4 Feb 2010 13:34:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757879Ab0BDNeQ (ORCPT ); Thu, 4 Feb 2010 08:34:16 -0500 Received: from smtp.nokia.com ([192.100.122.233]:24801 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756602Ab0BDNeQ (ORCPT ); Thu, 4 Feb 2010 08:34:16 -0500 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o14DWwI2022138 for ; Thu, 4 Feb 2010 15:34:09 +0200 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 4 Feb 2010 15:33:31 +0200 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 4 Feb 2010 15:33:31 +0200 Received: from [127.0.1.1] (essapo-nirac25321.europe.nokia.com [10.162.253.21]) by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o14DXSmE006097 for ; Thu, 4 Feb 2010 15:33:29 +0200 Subject: [PATCH] wl1251: fix txop unit To: linux-wireless@vger.kernel.org From: Kalle Valo Date: Thu, 04 Feb 2010 15:33:25 +0200 Message-ID: <20100204133325.10883.24828.stgit@tikku> User-Agent: StGit/0.15 MIME-Version: 1.0 X-OriginalArrivalTime: 04 Feb 2010 13:33:31.0535 (UTC) FILETIME=[A46AA9F0:01CAA59E] X-Nokia-AV: Clean Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 04 Feb 2010 13:34:20 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index a717dde..24ae6a3 100644 --- a/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/drivers/net/wireless/wl12xx/wl1251_main.c @@ -1144,9 +1144,10 @@ static int wl1251_op_conf_tx(struct ieee80211_hw *hw, u16 queue, if (ret < 0) goto out; + /* mac80211 uses units of 32 usec */ ret = wl1251_acx_ac_cfg(wl, wl1251_tx_get_queue(queue), params->cw_min, params->cw_max, - params->aifs, params->txop); + params->aifs, params->txop * 32); if (ret < 0) goto out_sleep;