Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index 818dea0164ec..f2ff18cf3e60 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -169,7 +169,7 @@ void ath9k_wmi_tasklet(unsigned long data)
                 break;
         }
 
-        dev_kfree_skb_any(skb);
+        kfree_skb(skb);
 }
 
 static void ath9k_wmi_rsp_callback(struct wmi *wmi, struct sk_buff *skb)
@@ -207,13 +207,13 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,
         ath9k_wmi_rsp_callback(wmi, skb);
 
 free_skb:
-        dev_kfree_skb_any(skb);
+        kfree_skb(skb);
 }
 
 static void ath9k_wmi_ctrl_tx(void *priv, struct sk_buff *skb,
                               enum htc_endpoint_id epid, bool txok)
 {
-        dev_kfree_skb_any(skb);
+        kfree_skb(skb);
 }
 
 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,
         if (!wmi)
                 return -EINVAL;
 
-        skb = dev_alloc_skb(headroom + cmd_len);
+        skb = alloc_skb(headroom + cmd_len, GFP_ATOMIC);
         if (!skb)
                 return -ENOMEM;
 
@@ -313,7 +313,7 @@ out:
         ath_print(common, ATH_DBG_WMI,
                   "WMI failure for: %s\n", wmi_cmd_to_name(cmd_id));
         mutex_unlock(&wmi->op_mutex);
-        dev_kfree_skb_any(skb);
+        kfree_skb(skb);
 
         return ret;
 }