projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[linux-2.6-block.git]
/
drivers
/
net
/
8139cp.c
diff --git
a/drivers/net/8139cp.c
b/drivers/net/8139cp.c
index 50efde11ea6c8790e8f0e679d9faaeb15e40f6f6..d0dbbf39349a3cb87d6eb19c51591bb736c9b9f5 100644
(file)
--- 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;
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);
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);
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;
if (!new_skb) {
dev->stats.rx_dropped++;
goto rx_next;