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
/
sb1250-mac.c
diff --git
a/drivers/net/sb1250-mac.c
b/drivers/net/sb1250-mac.c
index
103c317
..
0a3a379
100644
(file)
--- a/
drivers/net/sb1250-mac.c
+++ b/
drivers/net/sb1250-mac.c
@@
-933,9
+933,6
@@
static int sbdma_add_rcvbuffer(sbmacdma_t *d,struct sk_buff *sb)
}
sbdma_align_skb(sb_new, SMP_CACHE_BYTES, ETHER_ALIGN);
-
- /* mark skbuff owned by our device */
- sb_new->dev = d->sbdma_eth->sbm_dev;
}
else {
sb_new = sb;