From patchwork Thu Sep 3 09:50:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 45333 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n839pdjP029851 for ; Thu, 3 Sep 2009 09:51:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754847AbZICJu4 (ORCPT ); Thu, 3 Sep 2009 05:50:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754842AbZICJuz (ORCPT ); Thu, 3 Sep 2009 05:50:55 -0400 Received: from mail-ew0-f206.google.com ([209.85.219.206]:56104 "EHLO mail-ew0-f206.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754811AbZICJuz (ORCPT ); Thu, 3 Sep 2009 05:50:55 -0400 Received: by ewy2 with SMTP id 2so1645855ewy.17 for ; Thu, 03 Sep 2009 02:50:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=OCP2pWQbzsTMzP46RVq387GUHtPggSOYmxlji96P5VY=; b=QBSqZJbDNH73gHzgTqNU0dO3KYtGYpkS7GaPtZpQxqyQu/BiQk21KQmmRk/5RjB7Vn MTHxf6Fzl2D5OsD7fbqXfLPZHD8TYltgO6CkH6zva5ak5rphEWSrLf4M/hiOxCMJai79 akQ4LE+aA5kVBWQGIPjPz8e5ifIdOv/mnoHLg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=cC84lhnkhsiT0PbCao5yfbIy6SG/zzfj4tmsonNMZwo5NJfPbVcQUaGcev3cyPznQT yUu5/EAUzCba8e04iX4PlVnvRQxzs3pwkMr9vpZ66OhYuwPldUy9yZVOavsdoA9d4oxm ynF8BBYXNrmCfkgT2i2vTXN/aShVAEUSI1bM0= Received: by 10.216.11.133 with SMTP id 5mr436092wex.217.1251971455544; Thu, 03 Sep 2009 02:50:55 -0700 (PDT) Received: from localhost.localdomain (ppp85-140-246-137.pppoe.mtu-net.ru [85.140.246.137]) by mx.google.com with ESMTPS id g11sm2716255gve.28.2009.09.03.02.50.54 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Sep 2009 02:50:55 -0700 (PDT) From: Alexander Beregalov To: lrodriguez@atheros.com, linville@tuxdriver.com, linux-wireless@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexander Beregalov Subject: [PATCH] Staging: stlc45xx: fix usage of mac80211 workqueue Date: Thu, 3 Sep 2009 13:50:44 +0400 Message-Id: <1251971444-28690-1-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.4.2 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org See commit 42935ecaf(mac80211: redefine usage of the mac80211 workqueue). Fix build error. Signed-off-by: Alexander Beregalov --- drivers/staging/stlc45xx/stlc45xx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/stlc45xx/stlc45xx.c b/drivers/staging/stlc45xx/stlc45xx.c index 12d414d..9ec8bd1 100644 --- a/drivers/staging/stlc45xx/stlc45xx.c +++ b/drivers/staging/stlc45xx/stlc45xx.c @@ -1058,7 +1058,7 @@ static void stlc45xx_reset(struct stlc45xx *stlc) stlc45xx_warning("resetting firmware"); stlc->fw_state = FW_STATE_RESET; ieee80211_stop_queues(stlc->hw); - queue_work(stlc->hw->workqueue, &stlc->work_reset); + ieee80211_queue_work(stlc->hw, &stlc->work_reset); } static void stlc45xx_work_tx_timeout(struct work_struct *work) @@ -1489,7 +1489,7 @@ static irqreturn_t stlc45xx_interrupt(int irq, void *config) stlc45xx_debug(DEBUG_IRQ, "IRQ"); - queue_work(stlc->hw->workqueue, &stlc->work); + ieee80211_queue_work(stlc->hw, &stlc->work); return IRQ_HANDLED; } @@ -1568,7 +1568,7 @@ static int stlc45xx_wq_tx(struct stlc45xx *stlc) } list_add(&entry->tx_list, &stlc->tx_sent); - queue_delayed_work(stlc->hw->workqueue, + ieee80211_queue_delayed_work(stlc->hw, &stlc->work_tx_timeout, msecs_to_jiffies(TX_TIMEOUT)); } @@ -2132,7 +2132,7 @@ static int stlc45xx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) ieee80211_stop_queues(stlc->hw); } - queue_work(stlc->hw->workqueue, &stlc->work); + ieee80211_queue_work(stlc->hw, &stlc->work); spin_unlock_bh(&stlc->tx_lock);