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

Commit dede0381 authored by Yufeng Mo's avatar Yufeng Mo Committed by Greg Kroah-Hartman
Browse files

net: hns3: pad the short tunnel frame before sending to hardware 



commit d18e81183b1cb9c309266cbbce9acd3e0c528d04 upstream.

The hardware cannot handle short tunnel frames below 65 bytes,
and will cause vlan tag missing problem. So pads packet size to
65 bytes for tunnel frames to fix this bug.

Fixes: 3db084d2("net: hns3: Fix for vxlan tx checksum bug")
Signed-off-by: default avatarYufeng Mo <moyufeng@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4bf2c960

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ MODULE_PARM_DESC(debug, " Network interface message level setting"); 
#define HNS3_OUTER_VLAN_TAG	2

#define HNS3_OUTER_VLAN_TAG	2





#define HNS3_MIN_TX_LEN		33U

#define HNS3_MIN_TX_LEN		33U

#define HNS3_MIN_TUN_PKT_LEN	65U





/* hns3_pci_tbl - PCI Device ID Table

/* hns3_pci_tbl - PCI Device ID Table

 *

 *
@@ -931,8 +932,11 @@ static int hns3_set_l2l3l4(struct sk_buff *skb, u8 ol4_proto, 
			       l4.tcp->doff);

			       l4.tcp->doff);

		break;

		break;

	case IPPROTO_UDP:

	case IPPROTO_UDP:

		if (hns3_tunnel_csum_bug(skb))

		if (hns3_tunnel_csum_bug(skb)) {

			return skb_checksum_help(skb);

			int ret = skb_put_padto(skb, HNS3_MIN_TUN_PKT_LEN);



			return ret ? ret : skb_checksum_help(skb);

		}





		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,