From patchwork Thu Apr 15 07:13:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 92689 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 o3F7DRVo028491 for ; Thu, 15 Apr 2010 07:13:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752812Ab0DOHNZ (ORCPT ); Thu, 15 Apr 2010 03:13:25 -0400 Received: from mail-bw0-f225.google.com ([209.85.218.225]:54756 "EHLO mail-bw0-f225.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751926Ab0DOHNY (ORCPT ); Thu, 15 Apr 2010 03:13:24 -0400 Received: by bwz25 with SMTP id 25so1091871bwz.28 for ; Thu, 15 Apr 2010 00:13:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:subject:date :user-agent:cc:mime-version:message-id:x-uid:x-length:content-type :content-transfer-encoding; bh=EBfOSf0uhIeLurqYTohTTi9hj+kWQL15KXpTVoxdv2w=; b=lwhL52cV4YviCR9kpbMAsiLNY9sB2BJRLIcUUO1GuvNgskAfNCDIsKbIP9JZPrKe8y Z8PAGtYXeAkPm1OSwINCIRNYA/ATyyw1+qzG54BgXFTejpIbzOsPfGsdlcUQ0sdhnG0F AIh26z9S1NNfp8dCIYVP145nbJrgISGaPIbes= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:message-id:x-uid :x-length:content-type:content-transfer-encoding; b=wkSXQNR/eS9hFLaQnc5im6cLmJ9TbodQMA2tGudqQeI9FQ4UOiGaRcqjmBeXhfAffO IoaIpQlLijO9W7BsHBWoKJ1RwbR/PZ9bsA+4mvJDAHUsdCvUXM4oF6elyP8tz/vJ6/Bs dscr+epjU3V/ybVU24w8BX+U1VdcnzdVxjSho= Received: by 10.204.32.9 with SMTP id a9mr1513962bkd.44.1271315601599; Thu, 15 Apr 2010 00:13:21 -0700 (PDT) Received: from helmutmobil.localnet (p5495DD34.dip.t-dialin.net [84.149.221.52]) by mx.google.com with ESMTPS id 13sm952152bwz.7.2010.04.15.00.13.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 15 Apr 2010 00:13:20 -0700 (PDT) Received: from helmutmobil.localnet (p5495AF63.dip.t-dialin.net [84.149.175.99]) by mx.google.com with ESMTPS id z10sm11332509fka.1.2010.04.13.08.58.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 13 Apr 2010 08:58:24 -0700 (PDT) From: Helmut Schaa To: John Linville Subject: [PATCH 1/2] rt2x00: add txdesc parameter to write_tx_data Date: Thu, 15 Apr 2010 09:13:13 +0200 User-Agent: KMail/1.12.4 (Linux/2.6.34-rc3-wl-default; KDE/4.3.5; x86_64; ; ) Cc: Ivo van Doorn , Gertjan van Wingerde , linux-wireless@vger.kernel.org MIME-Version: 1.0 Message-Id: <201004150913.13636.helmut.schaa@googlemail.com> X-UID: 1105 X-Length: 5241 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, 15 Apr 2010 07:13:28 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 4de505b..4f9b666 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h @@ -549,7 +549,8 @@ struct rt2x00lib_ops { void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev, struct sk_buff *skb, struct txentry_desc *txdesc); - int (*write_tx_data) (struct queue_entry *entry); + int (*write_tx_data) (struct queue_entry *entry, + struct txentry_desc *txdesc); void (*write_beacon) (struct queue_entry *entry); int (*get_tx_data_len) (struct queue_entry *entry); void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev, diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 047123b..2fe9f29 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c @@ -62,7 +62,8 @@ EXPORT_SYMBOL_GPL(rt2x00pci_regbusy_read); /* * TX data handlers. */ -int rt2x00pci_write_tx_data(struct queue_entry *entry) +int rt2x00pci_write_tx_data(struct queue_entry *entry, + struct txentry_desc *txdesc) { struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; struct queue_entry_priv_pci *entry_priv = entry->priv_data; diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h index 8149ff6..51bcef3 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.h +++ b/drivers/net/wireless/rt2x00/rt2x00pci.h @@ -92,7 +92,8 @@ int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev, * This function will initialize the DMA and skb descriptor * to prepare the entry for the actual TX operation. */ -int rt2x00pci_write_tx_data(struct queue_entry *entry); +int rt2x00pci_write_tx_data(struct queue_entry *entry, + struct txentry_desc *txdesc); /** * struct queue_entry_priv_pci: Per entry PCI specific information diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index 5b6b789..72e4b04 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -525,7 +525,8 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, * call failed. Since we always return NETDEV_TX_OK to mac80211, * this frame will simply be dropped. */ - if (unlikely(queue->rt2x00dev->ops->lib->write_tx_data(entry))) { + if (unlikely(queue->rt2x00dev->ops->lib->write_tx_data(entry, + &txdesc))) { clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags); entry->skb = NULL; return -EIO; diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index 0a751e7..acf3282 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c @@ -215,7 +215,8 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb) rt2x00lib_txdone(entry, &txdesc); } -int rt2x00usb_write_tx_data(struct queue_entry *entry) +int rt2x00usb_write_tx_data(struct queue_entry *entry, + struct txentry_desc *txdesc) { struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev); diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h index 3da6841..621d0f8 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.h +++ b/drivers/net/wireless/rt2x00/rt2x00usb.h @@ -376,7 +376,8 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev); * This function will initialize the URB and skb descriptor * to prepare the entry for the actual TX operation. */ -int rt2x00usb_write_tx_data(struct queue_entry *entry); +int rt2x00usb_write_tx_data(struct queue_entry *entry, + struct txentry_desc *txdesc); /** * struct queue_entry_priv_usb: Per entry USB specific information