diff options
author | Ming Lei <tom.leiming@gmail.com> | 2010-04-12 12:29:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-14 14:52:43 -0400 |
commit | 0fa35a5836df2b8f285d6f53dfb4316c34621f88 (patch) | |
tree | 220eccf35fdff1213f4d6a1fd2c9312021e55c89 /drivers/net/wireless/ath/ath9k/wmi.c | |
parent | e6c6d33cb7d18721e56ce4bb5a0e22593956ef14 (diff) |
ath9k-htc:respect usb buffer cacheline alignment in reg out path
In ath9k-htc register out path, 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 skb 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: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/wmi.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/wmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c index acb66544a2aa..f2ff18cf3e60 100644 --- a/drivers/net/wireless/ath/ath9k/wmi.c +++ b/drivers/net/wireless/ath/ath9k/wmi.c | |||
@@ -213,7 +213,7 @@ free_skb: | |||
213 | static void ath9k_wmi_ctrl_tx(void *priv, struct sk_buff *skb, | 213 | static void ath9k_wmi_ctrl_tx(void *priv, struct sk_buff *skb, |
214 | enum htc_endpoint_id epid, bool txok) | 214 | enum htc_endpoint_id epid, bool txok) |
215 | { | 215 | { |
216 | dev_kfree_skb_any(skb); | 216 | kfree_skb(skb); |
217 | } | 217 | } |
218 | 218 | ||
219 | int ath9k_wmi_connect(struct htc_target *htc, struct wmi *wmi, | 219 | int ath9k_wmi_connect(struct htc_target *htc, struct wmi *wmi, |
@@ -269,7 +269,7 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id, | |||
269 | if (!wmi) | 269 | if (!wmi) |
270 | return -EINVAL; | 270 | return -EINVAL; |
271 | 271 | ||
272 | skb = dev_alloc_skb(headroom + cmd_len); | 272 | skb = alloc_skb(headroom + cmd_len, GFP_ATOMIC); |
273 | if (!skb) | 273 | if (!skb) |
274 | return -ENOMEM; | 274 | return -ENOMEM; |
275 | 275 | ||
@@ -313,7 +313,7 @@ out: | |||
313 | ath_print(common, ATH_DBG_WMI, | 313 | ath_print(common, ATH_DBG_WMI, |
314 | "WMI failure for: %s\n", wmi_cmd_to_name(cmd_id)); | 314 | "WMI failure for: %s\n", wmi_cmd_to_name(cmd_id)); |
315 | mutex_unlock(&wmi->op_mutex); | 315 | mutex_unlock(&wmi->op_mutex); |
316 | dev_kfree_skb_any(skb); | 316 | kfree_skb(skb); |
317 | 317 | ||
318 | return ret; | 318 | return ret; |
319 | } | 319 | } |