lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rt2x00: Rename driver write_tx_datadesc callback function.

Browse Source 
Now that the {usb,pci} specific write_tx_data functions are no longer
present we can rename the write_tx_datadesc callback function back to
its old name.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Gertjan van Wingerde
2010-06-29 21:42:23 +02:00
committed by John W. Linville
parent e513a0b6f1
commit 76dd5ddf23
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/rt2x00/rt2800pci.c
View File

@@ -645,8 +645,8 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev,
/* /*
* TX descriptor initialization * TX descriptor initialization
*/ */
static void rt2800pci_write_tx_datadesc(struct queue_entry* entry, static void rt2800pci_write_tx_data(struct queue_entry* entry,
struct txentry_desc *txdesc) struct txentry_desc *txdesc)
{ {
rt2800_write_txwi((__le32 *) entry->skb->data, txdesc); rt2800_write_txwi((__le32 *) entry->skb->data, txdesc);
} }
@@ -1044,7 +1044,7 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
.reset_tuner = rt2800_reset_tuner, .reset_tuner = rt2800_reset_tuner,
.link_tuner = rt2800_link_tuner, .link_tuner = rt2800_link_tuner,
.write_tx_desc = rt2800pci_write_tx_desc, .write_tx_desc = rt2800pci_write_tx_desc,
.write_tx_datadesc = rt2800pci_write_tx_datadesc, .write_tx_data = rt2800pci_write_tx_data,
.write_beacon = rt2800_write_beacon, .write_beacon = rt2800_write_beacon,
.kick_tx_queue = rt2800pci_kick_tx_queue, .kick_tx_queue = rt2800pci_kick_tx_queue,
.kill_tx_queue = rt2800pci_kill_tx_queue, .kill_tx_queue = rt2800pci_kill_tx_queue,

6
drivers/net/wireless/rt2x00/rt2x00.h
View File

@@ -550,10 +550,8 @@ struct rt2x00lib_ops {
void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev, void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev,
struct sk_buff *skb, struct sk_buff *skb,
struct txentry_desc *txdesc); struct txentry_desc *txdesc);
int (*write_tx_data) (struct queue_entry *entry, void (*write_tx_data) (struct queue_entry *entry,
struct txentry_desc *txdesc); struct txentry_desc *txdesc);
void (*write_tx_datadesc) (struct queue_entry *entry,
struct txentry_desc *txdesc);
void (*write_beacon) (struct queue_entry *entry, void (*write_beacon) (struct queue_entry *entry,
struct txentry_desc *txdesc); struct txentry_desc *txdesc);
int (*get_tx_data_len) (struct queue_entry *entry); int (*get_tx_data_len) (struct queue_entry *entry);

6
drivers/net/wireless/rt2x00/rt2x00queue.c
View File

@@ -430,10 +430,10 @@ static int rt2x00queue_write_tx_data(struct queue_entry *entry,
memset(entry->skb->data, 0, rt2x00dev->ops->extra_tx_headroom); memset(entry->skb->data, 0, rt2x00dev->ops->extra_tx_headroom);
/* /*
* Call the driver's write_tx_datadesc function, if it exists. * Call the driver's write_tx_data function, if it exists.
*/ */
if (rt2x00dev->ops->lib->write_tx_datadesc) if (rt2x00dev->ops->lib->write_tx_data)
rt2x00dev->ops->lib->write_tx_datadesc(entry, txdesc); rt2x00dev->ops->lib->write_tx_data(entry, txdesc);
/* /*
* Map the skb to DMA. * Map the skb to DMA.