diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-06 06:11:38 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-06 06:11:42 +0200 |
| commit | ed011b22ce567eabefa9ea571d3721c10ecd0553 (patch) | |
| tree | c7aee6684613075c772388a99a9137014549434e /drivers/net/8139cp.c | |
| parent | 85bac32c4a52c592b857f2c360cc5ec93a097d70 (diff) | |
| parent | e07cccf4046978df10f2e13fe2b99b2f9b3a65db (diff) | |
Merge commit 'v2.6.31-rc9' into tracing/core
Merge reason: move from -rc5 to -rc9.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/8139cp.c')
| -rw-r--r-- | drivers/net/8139cp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 50efde11ea6..d0dbbf39349 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; |