Commit 00207c7d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-fixes' 



Huazhong Tan says:

====================
net: hns3: fixes for -net

This series adds some bugfixes for the HNS3 ethernet driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents db7c691d 472497d0

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

+4 −3
Original line number Diff line number Diff line
@@ -575,8 +575,8 @@ static int hns3_nic_net_stop(struct net_device *netdev) 
	if (h->ae_algo->ops->set_timer_task)

		h->ae_algo->ops->set_timer_task(priv->ae_handle, false);



	netif_tx_stop_all_queues(netdev);

	netif_carrier_off(netdev);

	netif_tx_disable(netdev);



	hns3_nic_net_down(netdev);
@@ -824,7 +824,7 @@ static int hns3_get_l4_protocol(struct sk_buff *skb, u8 *ol4_proto, 
 * and it is udp packet, which has a dest port as the IANA assigned.

 * the hardware is expected to do the checksum offload, but the

 * hardware will not do the checksum offload when udp dest port is

 * 4789 or 6081.

 * 4789, 4790 or 6081.

 */

static bool hns3_tunnel_csum_bug(struct sk_buff *skb)

{
@@ -842,7 +842,8 @@ static bool hns3_tunnel_csum_bug(struct sk_buff *skb) 


	if (!(!skb->encapsulation &&

	      (l4.udp->dest == htons(IANA_VXLAN_UDP_PORT) ||

	      l4.udp->dest == htons(GENEVE_UDP_PORT))))

	      l4.udp->dest == htons(GENEVE_UDP_PORT) ||

	      l4.udp->dest == htons(4790))))

		return false;



	skb_checksum_help(skb);

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

+6 −0
Original line number Diff line number Diff line
@@ -3978,6 +3978,12 @@ static void hclge_update_reset_level(struct hclge_dev *hdev) 
	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(hdev->pdev);

	enum hnae3_reset_type reset_level;



	/* reset request will not be set during reset, so clear

	 * pending reset request to avoid unnecessary reset

	 * caused by the same reason.

	 */

	hclge_get_reset_level(ae_dev, &hdev->reset_request);



	/* if default_reset_request has a higher level reset request,

	 * it should be handled as soon as possible. since some errors

	 * need this kind of reset to fix.

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

+2 −0
Original line number Diff line number Diff line
@@ -255,6 +255,8 @@ void hclge_mac_start_phy(struct hclge_dev *hdev) 
	if (!phydev)

		return;



	phy_loopback(phydev, false);



	phy_start(phydev);

}