diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-14 20:15:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-14 20:15:39 -0400 |
| commit | 942e7b102a4827fdb69a39c7f07c544542589ef9 (patch) | |
| tree | 4c47174c91eb76aaa31abc141adbee1acc649987 /drivers/net/wireless/rt2x00/rt2x00pci.h | |
| parent | 7d06b2e053d2d536348e3a0f6bb02982a41bea37 (diff) | |
| parent | 87291c0269e77b029282676448fed3706a54211a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00pci.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h index 37c851e442c1..87c4a0cd78db 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.h +++ b/drivers/net/wireless/rt2x00/rt2x00pci.h | |||
| @@ -87,11 +87,14 @@ rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev, | |||
| 87 | memcpy_toio(rt2x00dev->csr.base + offset, value, length); | 87 | memcpy_toio(rt2x00dev->csr.base + offset, value, length); |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | /* | 90 | /** |
| 91 | * TX data handlers. | 91 | * rt2x00pci_write_tx_data - Initialize data for TX operation |
| 92 | * @entry: The entry where the frame is located | ||
| 93 | * | ||
| 94 | * This function will initialize the DMA and skb descriptor | ||
| 95 | * to prepare the entry for the actual TX operation. | ||
| 92 | */ | 96 | */ |
| 93 | int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev, | 97 | int rt2x00pci_write_tx_data(struct queue_entry *entry); |
| 94 | struct data_queue *queue, struct sk_buff *skb); | ||
| 95 | 98 | ||
| 96 | /** | 99 | /** |
| 97 | * struct queue_entry_priv_pci: Per entry PCI specific information | 100 | * struct queue_entry_priv_pci: Per entry PCI specific information |