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

Commit d43e5aca authored by Yunsheng Lin's avatar Yunsheng Lin Committed by David S. Miller
Browse files

net: hns3: Refactor the skb receiving and transmitting function 



This patch refactors the skb receiving and transmitting functions
and export them in order to support the ethtool's mac loopback
selftest.

Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8e8c0ec

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

+12 −5
Original line number Diff line number Diff line
@@ -900,8 +900,7 @@ static void hns_nic_dma_unmap(struct hns3_enet_ring *ring, int next_to_use_orig) 
	}

}



static netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb,

				     struct net_device *netdev)

netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	struct hns3_nic_ring_data *ring_data =
@@ -1943,6 +1942,11 @@ static void hns3_rx_checksum(struct hns3_enet_ring *ring, struct sk_buff *skb, 
	}

}



static void hns3_rx_skb(struct hns3_enet_ring *ring, struct sk_buff *skb)

{

	napi_gro_receive(&ring->tqp_vector->napi, skb);

}



static int hns3_handle_rx_bd(struct hns3_enet_ring *ring,

			     struct sk_buff **out_skb, int *out_bnum)

{
@@ -2077,7 +2081,9 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, 
	return 0;

}



static int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget)

int hns3_clean_rx_ring(

		struct hns3_enet_ring *ring, int budget,

		void (*rx_fn)(struct hns3_enet_ring *, struct sk_buff *))

{

#define RCB_NOF_ALLOC_RX_BUFF_ONCE 16

	struct net_device *netdev = ring->tqp->handle->kinfo.netdev;
@@ -2115,7 +2121,7 @@ static int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget) 


		/* Do update ip stack process */

		skb->protocol = eth_type_trans(skb, netdev);

		(void)napi_gro_receive(&ring->tqp_vector->napi, skb);

		rx_fn(ring, skb);



		recv_pkts++;

	}
@@ -2258,7 +2264,8 @@ static int hns3_nic_common_poll(struct napi_struct *napi, int budget) 
	rx_budget = max(budget / tqp_vector->num_tqps, 1);



	hns3_for_each_ring(ring, tqp_vector->rx_group) {

		int rx_cleaned = hns3_clean_rx_ring(ring, rx_budget);

		int rx_cleaned = hns3_clean_rx_ring(ring, rx_budget,

						    hns3_rx_skb);



		if (rx_cleaned >= rx_budget)

			clean_complete = false;

drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h

+4 −0
Original line number Diff line number Diff line
@@ -597,6 +597,10 @@ void hns3_ethtool_set_ops(struct net_device *netdev); 
int hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget);

int hns3_init_all_ring(struct hns3_nic_priv *priv);

int hns3_uninit_all_ring(struct hns3_nic_priv *priv);

netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev);

int hns3_clean_rx_ring(

		struct hns3_enet_ring *ring, int budget,

		void (*rx_fn)(struct hns3_enet_ring *, struct sk_buff *));



#ifdef CONFIG_HNS3_DCB

void hns3_dcbnl_setup(struct hnae3_handle *handle);