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

net: hns3: Support two vlan header when setting mtu 



This patch adds supports for two vlan header when setting mtu.

Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7b4a2f2

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

+3 −2
Original line number Diff line number Diff line
@@ -3609,8 +3609,9 @@ static int hns3_client_init(struct hnae3_handle *handle) 


	hns3_dcbnl_setup(handle);



	/* MTU range: (ETH_MIN_MTU(kernel default) - 9706) */

	netdev->max_mtu = HNS3_MAX_MTU - (ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);

	/* MTU range: (ETH_MIN_MTU(kernel default) - 9702) */

	netdev->max_mtu =

		HNS3_MAX_MTU - (ETH_HLEN + ETH_FCS_LEN + 2 * VLAN_HLEN);



	set_bit(HNS3_NIC_STATE_INITED, &priv->state);

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

+1 −1
Original line number Diff line number Diff line
@@ -6364,7 +6364,7 @@ static int hclge_set_mac_mtu(struct hclge_dev *hdev, int new_mtu) 
	int max_frm_size;

	int ret;



	max_frm_size = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;

	max_frm_size = new_mtu + ETH_HLEN + ETH_FCS_LEN + 2 * VLAN_HLEN;



	if (max_frm_size < HCLGE_MAC_MIN_FRAME ||

	    max_frm_size > HCLGE_MAC_MAX_FRAME)

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

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ enum HLCGE_PORT_TYPE { 
#define HCLGE_VECTOR0_IMP_RESET_INT_B	1



#define HCLGE_MAC_DEFAULT_FRAME \

	(ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN + ETH_DATA_LEN)

	(ETH_HLEN + ETH_FCS_LEN + 2 * VLAN_HLEN + ETH_DATA_LEN)

#define HCLGE_MAC_MIN_FRAME		64

#define HCLGE_MAC_MAX_FRAME		9728

CRA Git | Maintained and supported by SUSTech CRA and CCSE