redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

pasemi_mac: Remove SKB copy/recycle logic

Browse source 
pasemi_mac: Remove SKB copy/recycle logic

It doesn't really buy us much, since copying is about as expensive
as the allocation in the first place. Just remove it for now.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Olof Johansson 2007-11-28 20:57:56 -06:00 committed by David S. Miller
parent 7e9916e9dd
commit 5d8949448b
1 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/net/pasemi_mac.c
View file

@ -503,13 +503,8 @@ static void pasemi_mac_replenish_rx_ring(const struct net_device *dev,
/* Entry in use? */ /* Entry in use? */
WARN_ON(*buff); WARN_ON(*buff);
/* skb might still be in there for recycle on short receives */ skb = dev_alloc_skb(BUF_SIZE);
if (info->skb) skb_reserve(skb, LOCAL_SKB_ALIGN);
skb = info->skb;
else {
skb = dev_alloc_skb(BUF_SIZE);
skb_reserve(skb, LOCAL_SKB_ALIGN);
}
if (unlikely(!skb)) if (unlikely(!skb))
break; break;
@ -666,21 +661,7 @@ static int pasemi_mac_clean_rx(struct pasemi_mac_rxring *rx,
goto next; goto next;
} }
if (len < 256) { info->skb = NULL;
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->dma = 0; info->dma = 0;
if (likely((macrx & XCT_MACRX_HTY_M) == XCT_MACRX_HTY_IPV4_OK)) { if (likely((macrx & XCT_MACRX_HTY_M) == XCT_MACRX_HTY_IPV4_OK)) {