Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133946
b: refs/heads/master
c: ccdc4f1
h: refs/heads/master
v: v3
  • Loading branch information
Sascha Hauer authored and David S. Miller committed Feb 1, 2009
1 parent a06de73 commit 88abece
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 43268dcea7512cc10bc2542f20ce37971ecfeb48
refs/heads/master: ccdc4f198193eb4956b8dbc00745270525c4cd6e
7 changes: 5 additions & 2 deletions trunk/drivers/net/fec.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* Push the data cache so the CPM does not get stale memory
* data.
*/
flush_dcache_range((unsigned long)skb->data,
(unsigned long)skb->data + skb->len);
dma_sync_single(NULL, bdp->cbd_bufaddr,
bdp->cbd_datlen, DMA_TO_DEVICE);

/* Send it on its way. Tell FEC it's ready, interrupt when done,
* it's the last BD of the frame, and to put the CRC on the end.
Expand Down Expand Up @@ -630,6 +630,9 @@ while (!((status = bdp->cbd_sc) & BD_ENET_RX_EMPTY)) {
dev->stats.rx_bytes += pkt_len;
data = (__u8*)__va(bdp->cbd_bufaddr);

dma_sync_single(NULL, (unsigned long)__pa(data),
pkt_len - 4, DMA_FROM_DEVICE);

/* This does 16 byte alignment, exactly what we need.
* The packet length includes FCS, but we don't want to
* include that when passing upstream as it messes up
Expand Down

0 comments on commit 88abece

Please sign in to comment.