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]
/
drivers
/
net
/
lasi_82596.c
diff --git
a/drivers/net/lasi_82596.c
b/drivers/net/lasi_82596.c
index
452863d
..
0edcd12
100644
(file)
--- a/
drivers/net/lasi_82596.c
+++ b/
drivers/net/lasi_82596.c
@@
-801,7
+801,6
@@
memory_squeeze:
lp->stats.rx_dropped++;
}
else {
- skb->dev = dev;
if (!rx_in_place) {
/* 16 byte align the data fields */
dma_sync_single_for_cpu(lp->dev, (dma_addr_t)WSWAPchar(rbd->b_data), PKT_BUF_SZ, DMA_FROM_DEVICE);