]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ath9k-htc:respect usb buffer cacheline alignment in ath9k_hif_usb_alloc_rx_urbs
authorMing Lei <tom.leiming@gmail.com>
Mon, 12 Apr 2010 16:28:53 +0000 (00:28 +0800)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Apr 2010 18:52:42 +0000 (14:52 -0400)
In ath9k_hif_usb_alloc_rx_urbs, ath9k-htc will pass skb->data into
usb hcd and usb hcd will do dma mapping and unmapping to the buffer
pointed by skb->data, so we should pass a cache-line aligned address.

This patch replace __dev_alloc_skb with alloc_skb to make skb->data
pointed to a cacheline aligned address simply since ath9k-htc does not
skb_push on the skb and pass it to mac80211, also use kfree_skb to free
the skbs allocated by alloc_skb(we can use kfree_skb safely in hardirq
context since skb->destructor is NULL always in the path).

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/hif_usb.c

index e2117e7222e70dd4140a353d30fa07e9ca1367ba..178b11a8403a3f39075e99fd04f4b5ba5547ba79 100644 (file)
@@ -467,7 +467,7 @@ resubmit:
 
        return;
 free:
-       dev_kfree_skb_any(skb);
+       kfree_skb(skb);
 }
 
 static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
@@ -625,7 +625,7 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
                }
 
                /* Allocate buffer */
-               skb = __dev_alloc_skb(MAX_RX_BUF_SIZE, GFP_KERNEL);
+               skb = alloc_skb(MAX_RX_BUF_SIZE, GFP_KERNEL);
                if (!skb) {
                        ret = -ENOMEM;
                        goto err_skb;
@@ -657,7 +657,7 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
        return 0;
 
 err_submit:
-       dev_kfree_skb_any(skb);
+       kfree_skb(skb);
 err_skb:
        usb_free_urb(urb);
 err_urb: