From 8642183a7eb6b595991c65d0eaf24bbf0c5a92ae Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Wed, 28 Nov 2007 20:57:56 -0600
Subject: [PATCH] --- yaml --- r: 78979 b: refs/heads/master c:
 5d8949448b68b3b355036c8061e3282388826ec5 h: refs/heads/master i:   78977:
 4d199cd2f1a366c85562a7832dfa26391b59ae6b   78975:
 f2ca8f33b73ad7526d4b9960358c148247d744d7 v: v3

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

diff --git a/[refs] b/[refs]
index a317cd7c3afc..da967ece325a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e9916e9ddf23cd08107ed1a7fac429eea619313
+refs/heads/master: 5d8949448b68b3b355036c8061e3282388826ec5
diff --git a/trunk/drivers/net/pasemi_mac.c b/trunk/drivers/net/pasemi_mac.c
index ca773580cc51..07475bb7d860 100644
--- a/trunk/drivers/net/pasemi_mac.c
+++ b/trunk/drivers/net/pasemi_mac.c
@@ -503,13 +503,8 @@ static void pasemi_mac_replenish_rx_ring(const struct net_device *dev,
 		/* Entry in use? */
 		WARN_ON(*buff);
 
-		/* skb might still be in there for recycle on short receives */
-		if (info->skb)
-			skb = info->skb;
-		else {
-			skb = dev_alloc_skb(BUF_SIZE);
-			skb_reserve(skb, LOCAL_SKB_ALIGN);
-		}
+		skb = dev_alloc_skb(BUF_SIZE);
+		skb_reserve(skb, LOCAL_SKB_ALIGN);
 
 		if (unlikely(!skb))
 			break;
@@ -666,21 +661,7 @@ static int pasemi_mac_clean_rx(struct pasemi_mac_rxring *rx,
 			goto next;
 		}
 
-		if (len < 256) {
-			struct sk_buff *new_skb;
-
-			new_skb = netdev_alloc_skb(mac->netdev,
-						   len + LOCAL_SKB_ALIGN);
-			if (new_skb) {
-				skb_reserve(new_skb, LOCAL_SKB_ALIGN);
-				memcpy(new_skb->data, skb->data, len);
-				/* save the skb in buffer_info as good */
-				skb = new_skb;
-			}
-			/* else just continue with the old one */
-		} else
-			info->skb = NULL;
-
+		info->skb = NULL;
 		info->dma = 0;
 
 		if (likely((macrx & XCT_MACRX_HTY_M) == XCT_MACRX_HTY_IPV4_OK)) {