diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-14 06:59:44 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-14 06:59:44 +0400 |
| commit | 5c16807d3d196203d2d3c9fae51ac7e422091904 (patch) | |
| tree | 850c33533f80fe426b477c4660c61ba22315a808 /drivers/net/8139cp.c | |
| parent | e5e2a8fd8358d1b3a2c51c3248edee72e4194703 (diff) | |
| parent | 232e7d68d50c9ac3a55d716e5ae215ecd1e043b9 (diff) | |
| download | linux-5c16807d3d196203d2d3c9fae51ac7e422091904.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/netxen/netxen_nic_main.c
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 07919d0877ee..4a8995aaeca3 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; |