korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-18 03:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: hns3: rename hns_nic_dma_unmap

Browse Source 
To keep symmetrical, this patch renames hns_nic_dma_unmap to
hns3_clear_desc.

Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Fuyun Liang 2018-10-16 19:58:51 +08:00 committed by David S. Miller
parent 1e8a7977d0
commit ba3f808f5c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View File

@ -1134,7 +1134,7 @@ static int hns3_nic_maybe_stop_tx(struct sk_buff **out_skb, int *bnum,
return 0; return 0;
} }
static void hns_nic_dma_unmap(struct hns3_enet_ring *ring, int next_to_use_orig) static void hns3_clear_desc(struct hns3_enet_ring *ring, int next_to_use_orig)
{ {
struct device *dev = ring_to_dev(ring); struct device *dev = ring_to_dev(ring);
unsigned int i; unsigned int i;
@ -1208,7 +1208,7 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
ret = priv->ops.fill_desc(ring, skb, size, seg_num == 1 ? 1 : 0, ret = priv->ops.fill_desc(ring, skb, size, seg_num == 1 ? 1 : 0,
DESC_TYPE_SKB); DESC_TYPE_SKB);
if (ret) if (ret)
goto head_dma_map_err; goto head_fill_err;
next_to_use_frag = ring->next_to_use; next_to_use_frag = ring->next_to_use;
/* Fill the fragments */ /* Fill the fragments */
@ -1221,7 +1221,7 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
DESC_TYPE_PAGE); DESC_TYPE_PAGE);
if (ret) if (ret)
goto frag_dma_map_err; goto frag_fill_err;
} }
/* Complete translate all packets */ /* Complete translate all packets */
@ -1234,11 +1234,11 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
frag_dma_map_err: frag_fill_err:
hns_nic_dma_unmap(ring, next_to_use_frag); hns3_clear_desc(ring, next_to_use_frag);
head_dma_map_err: head_fill_err:
hns_nic_dma_unmap(ring, next_to_use_head); hns3_clear_desc(ring, next_to_use_head);
out_err_tx_ok: out_err_tx_ok:
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);