Skip to content

Commit

Permalink
ath9k-htc:respect usb buffer cacheline alignment in ath9k_hif_usb_all…
Browse files Browse the repository at this point in the history
…oc_rx_urbs

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>
  • Loading branch information
Ming Lei authored and John W. Linville committed Apr 14, 2010
1 parent 87d77c4 commit f28a7b3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/wireless/ath/ath9k/hif_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ static void ath9k_hif_usb_rx_cb(struct urb *urb)

return;
free:
dev_kfree_skb_any(skb);
kfree_skb(skb);
}

static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit f28a7b3

Please sign in to comment.