X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fwireless%2Frt2x00%2Frt2x00usb.c;h=caee65e821986ce4caebec5a71d4fb067f9f73b3;hb=fb55f4d1fa252ba1e479284b79da1049d658c371;hp=6cb4432e1ee0e040ae69cda57e183842e856bef6;hpb=330e3f95b30d9616edd6df7646473179c159c00d;p=linux-2.6

diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 6cb4432e1e..caee65e821 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -122,58 +122,6 @@ int rt2x00usb_vendor_request_buff(struct rt2x00_dev *rt2x00dev,
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_vendor_request_buff);
 
-static void rt2x00usb_vendor_request_async_complete(struct urb *urb)
-{
-	/*
-	 * We're done with it, descrease usage count and let the
-	 * usb layer delete it as soon as it is done with it.
-	 */
-	usb_put_urb(urb);
-}
-
-int rt2x00usb_vendor_request_async(struct rt2x00_dev *rt2x00dev,
-				   const u8 request, const u16 offset,
-				   const u16 value)
-{
-	struct usb_device *usb_dev = rt2x00dev_usb_dev(rt2x00dev);
-	struct usb_ctrlrequest *ctrl;
-	struct urb *urb;
-	int status;
-
-	urb = usb_alloc_urb(0, GFP_NOIO);
-	if (!urb)
-		return -ENOMEM;
-
-	ctrl = kmalloc(sizeof(struct usb_ctrlrequest), GFP_NOIO);
-	if (!ctrl) {
-		status = -ENOMEM;
-		goto exit;
-	}
-
-	ctrl->bRequestType= USB_VENDOR_REQUEST_OUT;
-	ctrl->bRequest = request;
-	ctrl->wValue = cpu_to_le16p(&value);
-	ctrl->wIndex = cpu_to_le16p(&offset);
-	ctrl->wLength = 0;
-
-	usb_fill_control_urb(urb, usb_dev, usb_sndctrlpipe(usb_dev, 0),
-			     (unsigned char *)ctrl, NULL, 0,
-			     rt2x00usb_vendor_request_async_complete, NULL);
-
-	status = usb_submit_urb(urb, GFP_ATOMIC);
-	if (!status)
-		goto exit;
-
-	return 0;
-
-exit:
-	usb_put_urb(urb);
-	kfree(ctrl);
-
-	return status;
-}
-EXPORT_SYMBOL_GPL(rt2x00usb_vendor_request_async);
-
 /*
  * TX data handlers.
  */
@@ -199,8 +147,17 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
 
 	/*
 	 * Obtain the status about this packet.
+	 * Note that when the status is 0 it does not mean the
+	 * frame was send out correctly. It only means the frame
+	 * was succesfully pushed to the hardware, we have no
+	 * way to determine the transmission status right now.
+	 * (Only indirectly by looking at the failed TX counters
+	 * in the register).
 	 */
-	txdesc.status = !urb->status ? TX_SUCCESS : TX_FAIL_RETRY;
+	if (!urb->status)
+		__set_bit(TXDONE_UNKNOWN, &txdesc.flags);
+	else
+		__set_bit(TXDONE_FAILURE, &txdesc.flags);
 	txdesc.retry = 0;
 	txdesc.control = &priv_tx->control;
 
@@ -238,7 +195,7 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
 		ERROR(rt2x00dev,
 		      "Arrived at non-free entry in the non-full queue %d.\n"
 		      "Please file bug report to %s.\n",
-		      control->queue, DRV_PROJECT);
+		      entry->queue->qid, DRV_PROJECT);
 		return -EINVAL;
 	}
 
@@ -252,13 +209,13 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
 	 * Fill in skb descriptor
 	 */
 	skbdesc = get_skb_frame_desc(skb);
-	memset(skbdesc, 0, sizeof(*skbdesc));
 	skbdesc->data = skb->data + queue->desc_size;
 	skbdesc->data_len = skb->len - queue->desc_size;
 	skbdesc->desc = skb->data;
 	skbdesc->desc_len = queue->desc_size;
 	skbdesc->entry = entry;
 
+	memcpy(&priv_tx->control, control, sizeof(priv_tx->control));
 	rt2x00lib_write_tx_desc(rt2x00dev, skb, control);
 
 	/*
@@ -300,11 +257,11 @@ static struct sk_buff* rt2x00usb_alloc_rxskb(struct data_queue *queue)
 	 * advance.
 	 */
 	frame_size = queue->data_size + queue->desc_size;
-	skb = dev_alloc_skb(frame_size + 2);
+	skb = dev_alloc_skb(queue->desc_size + frame_size + 2);
 	if (!skb)
 		return NULL;
 
-	skb_reserve(skb, 2);
+	skb_reserve(skb, queue->desc_size + 2);
 	skb_put(skb, frame_size);
 
 	return skb;
@@ -317,6 +274,7 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
 	struct sk_buff *skb;
 	struct skb_frame_desc *skbdesc;
 	struct rxdone_entry_desc rxdesc;
+	int header_size;
 
 	if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) ||
 	    !test_and_clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
@@ -340,6 +298,19 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
 	memset(&rxdesc, 0, sizeof(rxdesc));
 	rt2x00dev->ops->lib->fill_rxdone(entry, &rxdesc);
 
+	/*
+	 * The data behind the ieee80211 header must be
+	 * aligned on a 4 byte boundary.
+	 */
+	header_size = ieee80211_get_hdrlen_from_skb(entry->skb);
+	if (header_size % 4 == 0) {
+		skb_push(entry->skb, 2);
+		memmove(entry->skb->data, entry->skb->data + 2,
+			entry->skb->len - 2);
+		skbdesc->data = entry->skb->data;
+		skb_trim(entry->skb,entry->skb->len - 2);
+	}
+
 	/*
 	 * Allocate a new sk buffer to replace the current one.
 	 * If allocation fails, we should drop the current frame
@@ -382,7 +353,7 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev)
 	struct data_queue *queue;
 	unsigned int i;
 
-	rt2x00usb_vendor_request_sw(rt2x00dev, USB_RX_CONTROL, 0x0000, 0x0000,
+	rt2x00usb_vendor_request_sw(rt2x00dev, USB_RX_CONTROL, 0, 0,
 				    REGISTER_TIMEOUT);
 
 	/*