Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bbbf15d authored by Peng Li's avatar Peng Li Committed by David S. Miller
Browse files

net: hns3: remove hns3_fill_desc_tso 



This patch removes hns3_fill_desc_tso in preparation for
fixing some desc filling bug, because for tso or non-tso
case, we will use the unified hns3_fill_desc.

Signed-off-by: default avatarFuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb385146

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+5 −39
Original line number Diff line number Diff line
@@ -1054,35 +1054,6 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, 
	return 0;

}



static int hns3_fill_desc_tso(struct hns3_enet_ring *ring, void *priv,

			      int size, dma_addr_t dma, int frag_end,

			      enum hns_desc_type type)

{

	unsigned int frag_buf_num;

	unsigned int k;

	int sizeoflast;

	int ret;



	frag_buf_num = (size + HNS3_MAX_BD_SIZE - 1) / HNS3_MAX_BD_SIZE;

	sizeoflast = size % HNS3_MAX_BD_SIZE;

	sizeoflast = sizeoflast ? sizeoflast : HNS3_MAX_BD_SIZE;



	/* When the frag size is bigger than hardware, split this frag */

	for (k = 0; k < frag_buf_num; k++) {

		ret = hns3_fill_desc(ring, priv,

				     (k == frag_buf_num - 1) ?

				sizeoflast : HNS3_MAX_BD_SIZE,

				dma + HNS3_MAX_BD_SIZE * k,

				frag_end && (k == frag_buf_num - 1) ? 1 : 0,

				(type == DESC_TYPE_SKB && !k) ?

					DESC_TYPE_SKB : DESC_TYPE_PAGE);

		if (ret)

			return ret;

	}



	return 0;

}



static int hns3_nic_maybe_stop_tso(struct sk_buff **out_skb, int *bnum,

				   struct hns3_enet_ring *ring)

{
@@ -1313,14 +1284,11 @@ static int hns3_nic_set_features(struct net_device *netdev, 
	int ret;



	if (changed & (NETIF_F_TSO | NETIF_F_TSO6)) {

		if (features & (NETIF_F_TSO | NETIF_F_TSO6)) {

			priv->ops.fill_desc = hns3_fill_desc_tso;

		if (features & (NETIF_F_TSO | NETIF_F_TSO6))

			priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tso;

		} else {

			priv->ops.fill_desc = hns3_fill_desc;

		else

			priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tx;

	}

	}



	if ((changed & NETIF_F_HW_VLAN_CTAG_FILTER) &&

	    h->ae_algo->ops->enable_vlan_filter) {
@@ -3247,15 +3215,13 @@ static void hns3_nic_set_priv_ops(struct net_device *netdev) 
{

	struct hns3_nic_priv *priv = netdev_priv(netdev);



	priv->ops.fill_desc = hns3_fill_desc;

	if ((netdev->features & NETIF_F_TSO) ||

	    (netdev->features & NETIF_F_TSO6)) {

		priv->ops.fill_desc = hns3_fill_desc_tso;

	    (netdev->features & NETIF_F_TSO6))

		priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tso;

	} else {

		priv->ops.fill_desc = hns3_fill_desc;

	else

		priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tx;

}

}



static int hns3_client_init(struct hnae3_handle *handle)

{