Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 50efde11ea6c..d0dbbf39349a 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -515,7 +515,7 @@ rx_status_loop:
                 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 @@ rx_status_loop:
                         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;