hurricos/openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ramips: raeth: cleanup DMA API usage in ramips_eth_hard_start_xmit

Browse Source 
SVN-Revision: 30447
This commit is contained in:
Gabor Juhos 2012-02-11 15:12:05 +00:00
parent 2d055f130e
commit c6fa11d00f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/ramips/files/drivers/net/ramips.c
View File

@ -219,7 +219,7 @@ ramips_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct raeth_priv *priv = netdev_priv(dev); struct raeth_priv *priv = netdev_priv(dev);
unsigned long tx; unsigned long tx;
unsigned int tx_next; unsigned int tx_next;
unsigned int mapped_addr; dma_addr_t mapped_addr;
if (priv->plat->min_pkt_len) { if (priv->plat->min_pkt_len) {
if (skb->len < priv->plat->min_pkt_len) { if (skb->len < priv->plat->min_pkt_len) {
@ -234,9 +234,8 @@ ramips_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
} }
dev->trans_start = jiffies; dev->trans_start = jiffies;
mapped_addr = (unsigned int) dma_map_single(NULL, skb->data, skb->len, mapped_addr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
DMA_TO_DEVICE);
dma_sync_single_for_device(NULL, mapped_addr, skb->len, DMA_TO_DEVICE);
spin_lock(&priv->page_lock); spin_lock(&priv->page_lock);
tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0); tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0);
tx_next = (tx + 1) % NUM_TX_DESC; tx_next = (tx + 1) % NUM_TX_DESC;
@ -246,7 +245,7 @@ ramips_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
!(priv->tx[tx_next].txd2 & TX_DMA_DONE)) !(priv->tx[tx_next].txd2 & TX_DMA_DONE))
goto out; goto out;
priv->tx[tx].txd1 = mapped_addr; priv->tx[tx].txd1 = (unsigned int) mapped_addr;
priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE); priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE);
priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len); priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len);
dev->stats.tx_packets++; dev->stats.tx_packets++;