diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800pci.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c index 88dba7f76ae..72e4f29a2fc 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c | |||
@@ -613,18 +613,10 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev, | |||
613 | /* | 613 | /* |
614 | * TX descriptor initialization | 614 | * TX descriptor initialization |
615 | */ | 615 | */ |
616 | static int rt2800pci_write_tx_data(struct queue_entry* entry, | 616 | static void rt2800pci_write_tx_datadesc(struct queue_entry* entry, |
617 | struct txentry_desc *txdesc) | 617 | struct txentry_desc *txdesc) |
618 | { | 618 | { |
619 | int ret; | ||
620 | |||
621 | ret = rt2x00pci_write_tx_data(entry, txdesc); | ||
622 | if (ret) | ||
623 | return ret; | ||
624 | |||
625 | rt2800_write_txwi(entry->skb, txdesc); | 619 | rt2800_write_txwi(entry->skb, txdesc); |
626 | |||
627 | return 0; | ||
628 | } | 620 | } |
629 | 621 | ||
630 | 622 | ||
@@ -1079,7 +1071,8 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { | |||
1079 | .reset_tuner = rt2800_reset_tuner, | 1071 | .reset_tuner = rt2800_reset_tuner, |
1080 | .link_tuner = rt2800_link_tuner, | 1072 | .link_tuner = rt2800_link_tuner, |
1081 | .write_tx_desc = rt2800pci_write_tx_desc, | 1073 | .write_tx_desc = rt2800pci_write_tx_desc, |
1082 | .write_tx_data = rt2800pci_write_tx_data, | 1074 | .write_tx_data = rt2x00pci_write_tx_data, |
1075 | .write_tx_datadesc = rt2800pci_write_tx_datadesc, | ||
1083 | .write_beacon = rt2800pci_write_beacon, | 1076 | .write_beacon = rt2800pci_write_beacon, |
1084 | .kick_tx_queue = rt2800pci_kick_tx_queue, | 1077 | .kick_tx_queue = rt2800pci_kick_tx_queue, |
1085 | .kill_tx_queue = rt2800pci_kill_tx_queue, | 1078 | .kill_tx_queue = rt2800pci_kill_tx_queue, |