aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00usb.c
diff options
context:
space:
mode:
authorGertjan van Wingerde <gwingerde@gmail.com>2010-06-29 15:41:40 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-06-30 15:00:50 -0400
commite513a0b6f1bf8e1b59b0e1382d4e7ef3d344d535 (patch)
tree6cc2ff94dd486eb4b5eb7b6d2aabc0bff4b033c5 /drivers/net/wireless/rt2x00/rt2x00usb.c
parent78eea11b0e6ae5771bc19cc46984f1cdcbbb6ba1 (diff)
rt2x00: Move common txdone handling to rt2x00lib_txdone.
Now that the write_tx_data functions are merged, also merge the relevant parts of the txdone handling into common code, rather than {usb,pci} specific code. 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>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00usb.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00usb.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index f78ebb4d8cf1..a22837c560fd 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -171,7 +171,6 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
171{ 171{
172 struct queue_entry *entry = (struct queue_entry *)urb->context; 172 struct queue_entry *entry = (struct queue_entry *)urb->context;
173 struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; 173 struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
174 struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
175 struct txdone_entry_desc txdesc; 174 struct txdone_entry_desc txdesc;
176 175
177 if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags) || 176 if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags) ||
@@ -179,16 +178,6 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
179 return; 178 return;
180 179
181 /* 180 /*
182 * Remove the descriptor from the front of the skb.
183 */
184 skb_pull(entry->skb, entry->queue->desc_size);
185
186 /*
187 * Signal that the TX descriptor is no longer in the skb.
188 */
189 skbdesc->flags &= ~SKBDESC_DESC_IN_SKB;
190
191 /*
192 * Obtain the status about this packet. 181 * Obtain the status about this packet.
193 * Note that when the status is 0 it does not mean the 182 * Note that when the status is 0 it does not mean the
194 * frame was send out correctly. It only means the frame 183 * frame was send out correctly. It only means the frame