From 4fe50bb0d04904bbb5265a2077751d69942c4caa Mon Sep 17 00:00:00 2001
From: Ming Lei <tom.leiming@gmail.com>
Date: Tue, 13 Apr 2010 00:28:53 +0800
Subject: [PATCH] --- yaml --- r: 194271 b: refs/heads/master c:
 f28a7b30cdaa936bdbdc0a2018241936fb56cae6 h: refs/heads/master i:   194269:
 fec90340c656129ed45ba436cb5fc4cecfc2ee30   194267:
 f403e1b015b2a62bd2c56e7dbbcbc15414bb51fe   194263:
 59e0b74f14a4f3eeddd216cfe08c1e133d5d5238   194255:
 b1dc1a7f49f02aab4c78fab9f32804fae47bf46c   194239:
 e2f484a255da9879f36d72cf90547b6354de52be v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/hif_usb.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2dfd530a3076..941d66b93472 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87d77c4ef132599eb3a6c49520719d39f7341efd
+refs/heads/master: f28a7b30cdaa936bdbdc0a2018241936fb56cae6
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c b/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c
index e2117e7222e7..178b11a8403a 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -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)
@@ -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: