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
/
ariadne.c
diff --git
a/drivers/net/ariadne.c
b/drivers/net/ariadne.c
index
9dfc09b
..
a0e68e7
100644
(file)
--- a/
drivers/net/ariadne.c
+++ b/
drivers/net/ariadne.c
@@
-743,7
+743,6
@@
static int ariadne_rx(struct net_device *dev)
}
- skb->dev = dev;
skb_reserve(skb,2); /* 16 byte align */
skb_put(skb,pkt_len); /* Make room */
eth_copy_and_sum(skb, (char *)priv->rx_buff[entry], pkt_len,0);