Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150487
b: refs/heads/master
c: e88aae7
h: refs/heads/master
i:
  150485: 69a3016
  150483: 9d3b151
  150479: 5e0310d
v: v3
  • Loading branch information
Yoshihiro Shimoda authored and David S. Miller committed May 26, 2009
1 parent 5a36172 commit 935ef8a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a1dcb6628b9489504a3be2515580fc4de891f94a
refs/heads/master: e88aae7bb1dc50457489d1d7c81dcf4db23ccf94
4 changes: 4 additions & 0 deletions trunk/drivers/net/sh_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ static void sh_eth_ring_format(struct net_device *ndev)
mdp->rx_skbuff[i] = skb;
if (skb == NULL)
break;
dma_map_single(&ndev->dev, skb->tail, mdp->rx_buf_sz,
DMA_FROM_DEVICE);
skb->dev = ndev; /* Mark as being used by this device. */
#if defined(CONFIG_CPU_SUBTYPE_SH7763)
reserve = SH7763_SKB_ALIGN
Expand Down Expand Up @@ -559,6 +561,8 @@ static int sh_eth_rx(struct net_device *ndev)
mdp->rx_skbuff[entry] = skb;
if (skb == NULL)
break; /* Better luck next round. */
dma_map_single(&ndev->dev, skb->tail, mdp->rx_buf_sz,
DMA_FROM_DEVICE);
skb->dev = ndev;
#if defined(CONFIG_CPU_SUBTYPE_SH7763)
reserve = SH7763_SKB_ALIGN
Expand Down

0 comments on commit 935ef8a

Please sign in to comment.