diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-17 13:57:43 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-17 13:57:43 -0400 |
| commit | 6fe70aae0d128339febfabc073ba4c4a03de4f45 (patch) | |
| tree | 711dff90df5ca4e07b5bddf11b2819e5cf2b7a93 /drivers/net/wireless/rt2x00/rt2x00usb.c | |
| parent | 278554bd6579206921f5d8a523649a7a57f8850d (diff) | |
| parent | 0c348d7c1422d59a86d6fb37b53d75788043e50b (diff) | |
| download | talos-op-linux-6fe70aae0d128339febfabc073ba4c4a03de4f45.tar.gz talos-op-linux-6fe70aae0d128339febfabc073ba4c4a03de4f45.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00usb.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index da111c0c2928..bd1546ba7ad2 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c @@ -222,7 +222,6 @@ int rt2x00usb_write_tx_data(struct queue_entry *entry, struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev); struct queue_entry_priv_usb *entry_priv = entry->priv_data; - struct skb_frame_desc *skbdesc; u32 length; /* @@ -232,13 +231,6 @@ int rt2x00usb_write_tx_data(struct queue_entry *entry, memset(entry->skb->data, 0, entry->queue->desc_size); /* - * Fill in skb descriptor - */ - skbdesc = get_skb_frame_desc(entry->skb); - skbdesc->desc = entry->skb->data; - skbdesc->desc_len = entry->queue->desc_size; - - /* * USB devices cannot blindly pass the skb->len as the * length of the data to usb_fill_bulk_urb. Pass the skb * to the driver to determine what the length should be. |
