From 2b2e9952939ebf291e6c2ad14f33364daba81a60 Mon Sep 17 00:00:00 2001
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Wed, 12 Aug 2009 22:18:14 -0700
Subject: [PATCH] --- yaml --- r: 156898 b: refs/heads/master c:
 839d1624b9dcf31fdc02e47359043bb7bd71d6ca h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ced3fda6ad34..1a9cca4d1d1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9799218ae36910af50f002a5db1802d576fffb43
+refs/heads/master: 839d1624b9dcf31fdc02e47359043bb7bd71d6ca
diff --git a/trunk/drivers/net/8139cp.c b/trunk/drivers/net/8139cp.c
index 50efde11ea6c..d0dbbf39349a 100644
--- a/trunk/drivers/net/8139cp.c
+++ b/trunk/drivers/net/8139cp.c
@@ -515,7 +515,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget)
 		dma_addr_t mapping;
 		struct sk_buff *skb, *new_skb;
 		struct cp_desc *desc;
-		unsigned buflen;
+		const unsigned buflen = cp->rx_buf_sz;
 
 		skb = cp->rx_skb[rx_tail];
 		BUG_ON(!skb);
@@ -549,8 +549,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget)
 			pr_debug("%s: rx slot %d status 0x%x len %d\n",
 			       dev->name, rx_tail, status, len);
 
-		buflen = cp->rx_buf_sz + NET_IP_ALIGN;
-		new_skb = netdev_alloc_skb(dev, buflen);
+		new_skb = netdev_alloc_skb(dev, buflen + NET_IP_ALIGN);
 		if (!new_skb) {
 			dev->stats.rx_dropped++;
 			goto rx_next;