1 files changed, 4 insertions, 11 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 089a12c7b90f..20dbdd6fb904 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -421,6 +421,7 @@ static void rt2x00queue_write_tx_descriptor(struct queue_entry *entry,
 {
         struct data_queue *queue = entry->queue;
         struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
+        enum rt2x00_dump_type dump_type;
 
         rt2x00dev->ops->lib->write_tx_desc(rt2x00dev, entry->skb, txdesc);
 
@@ -428,7 +429,9 @@ static void rt2x00queue_write_tx_descriptor(struct queue_entry *entry,
          * All processing on the frame has been completed, this means
          * it is now ready to be dumped to userspace through debugfs.
          */
-        rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TX, entry->skb);
+        dump_type = (txdesc->queue == QID_BEACON) ?
+                                        DUMP_FRAME_BEACON : DUMP_FRAME_TX;
+        rt2x00debug_dump_frame(rt2x00dev, dump_type, entry->skb);
 }
 
 static void rt2x00queue_kick_tx_queue(struct queue_entry *entry,
@@ -553,7 +556,6 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,
         struct rt2x00_intf *intf = vif_to_intf(vif);
         struct skb_frame_desc *skbdesc;
         struct txentry_desc txdesc;
-        __le32 desc[16];
 
         if (unlikely(!intf->beacon))
                 return -ENOBUFS;
@@ -586,19 +588,10 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,
         rt2x00queue_create_tx_descriptor(intf->beacon, &txdesc);
 
         /*
-         * For the descriptor we use a local array from where the
-         * driver can move it to the correct location required for
-         * the hardware.
-         */
-        memset(desc, 0, sizeof(desc));
-
-        /*
          * Fill in skb descriptor
          */
         skbdesc = get_skb_frame_desc(intf->beacon->skb);
         memset(skbdesc, 0, sizeof(*skbdesc));
-        skbdesc->desc = desc;
-        skbdesc->desc_len = intf->beacon->queue->desc_size;
         skbdesc->entry = intf->beacon;
 
         /*