From ce1c887ae53b752049f11ed4569cf0d1760bc26b Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 23 Mar 2006 08:51:38 -0800
Subject: [PATCH] --- yaml --- r: 23309 b: refs/heads/master c:
 15240072ac3ffb67050acd0b71b477c3bb977670 h: refs/heads/master i:   23307:
 a43833ac868b5d62fd4373e031c3e1109339502e v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a8d75bb5f516..8f164d811599 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 050ff18016979b98e3cadb930d6e29bfd5530469
+refs/heads/master: 15240072ac3ffb67050acd0b71b477c3bb977670
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index f3f70b07576d..68f9c206a620 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1175,7 +1175,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 		/* just drop the packet if non-linear expansion fails */
 		if (skb_header_cloned(skb) &&
 		    pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
-			dev_kfree_skb_any(skb);
+			dev_kfree_skb(skb);
 			goto out_unlock;
 		}
 
@@ -1324,7 +1324,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
 				       PCI_DMA_TODEVICE);
 		}
 
-		dev_kfree_skb_any(skb);
+		dev_kfree_skb(skb);
 	}
 
 	sky2->tx_cons = put;