4 files changed, 18 insertions, 11 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 88dba7f76aef..72e4f29a2fc7 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,
 /*
  * TX descriptor initialization
  */
-static int rt2800pci_write_tx_data(struct queue_entry* entry,
-                                   struct txentry_desc *txdesc)
+static void rt2800pci_write_tx_datadesc(struct queue_entry* entry,
+                                         struct txentry_desc *txdesc)
 {
-        int ret;
-
-        ret = rt2x00pci_write_tx_data(entry, txdesc);
-        if (ret)
-                return ret;
-
         rt2800_write_txwi(entry->skb, txdesc);
-
-        return 0;
 }
 
 
@@ -1079,7 +1071,8 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
         .reset_tuner            = rt2800_reset_tuner,
         .link_tuner             = rt2800_link_tuner,
         .write_tx_desc          = rt2800pci_write_tx_desc,
-        .write_tx_data          = rt2800pci_write_tx_data,
+        .write_tx_data          = rt2x00pci_write_tx_data,
+        .write_tx_datadesc      = rt2800pci_write_tx_datadesc,
         .write_beacon           = rt2800pci_write_beacon,
         .kick_tx_queue          = rt2800pci_kick_tx_queue,
         .kill_tx_queue          = rt2800pci_kill_tx_queue,
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index c8e5fed4dc07..811844be0053 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -552,6 +552,8 @@ struct rt2x00lib_ops {
                                struct txentry_desc *txdesc);
         int (*write_tx_data) (struct queue_entry *entry,
                               struct txentry_desc *txdesc);
+        void (*write_tx_datadesc) (struct queue_entry *entry,
+                                   struct txentry_desc *txdesc);
         void (*write_beacon) (struct queue_entry *entry,
                               struct txentry_desc *txdesc);
         int (*get_tx_data_len) (struct queue_entry *entry);
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index f71eee67f977..494b960e811c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -81,6 +81,12 @@ int rt2x00pci_write_tx_data(struct queue_entry *entry,
                 return -EINVAL;
         }
 
+        /*
+         * Call the driver's write_tx_datadesc function, if it exists.
+         */
+        if (rt2x00dev->ops->lib->write_tx_datadesc)
+                rt2x00dev->ops->lib->write_tx_datadesc(entry, txdesc);
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_write_tx_data);
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index bd1546ba7ad2..25cc376d388e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -248,6 +248,12 @@ int rt2x00usb_write_tx_data(struct queue_entry *entry,
          */
         skb_pull(entry->skb, entry->queue->desc_size);
 
+        /*
+         * Call the driver's write_tx_datadesc function, if it exists.
+         */
+        if (rt2x00dev->ops->lib->write_tx_datadesc)
+                rt2x00dev->ops->lib->write_tx_datadesc(entry, txdesc);
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_write_tx_data);