git.openpandora.org
/
pandora-kernel.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 master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[pandora-kernel.git]
/
arch
/
ppc
/
8xx_io
/
enet.c
diff --git
a/arch/ppc/8xx_io/enet.c
b/arch/ppc/8xx_io/enet.c
index
b23c45b
..
bfa3f52
100644
(file)
--- a/
arch/ppc/8xx_io/enet.c
+++ b/
arch/ppc/8xx_io/enet.c
@@
-506,7
+506,6
@@
for (;;) {
cep->stats.rx_dropped++;
}
else {
- skb->dev = dev;
skb_put(skb,pkt_len-4); /* Make room */
eth_copy_and_sum(skb,
cep->rx_vaddr[bdp - cep->rx_bd_base],