From ff769d1df2008ca02b0e28a0a28e5ddc6aa6c246 Mon Sep 17 00:00:00 2001 From: shenjian Date: Fri, 12 Jul 2019 17:18:56 +0800 Subject: [PATCH] net: hns3: fix transmit issue when port link up driver inclusion category: bugfix bugzilla: NA CVE: NA There are an return value check missed, which may cause RAS issue when port up. Feature or Bugfix:Bugfix Signed-off-by: shenjian (K) Reviewed-by: linyunsheng Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index ca347ae50b26..93e7662ab06c 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -1071,6 +1071,7 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, vflags.out_vtag = 0; ret = hns3_fill_desc_vtags(skb, ring, &vflags); + if (unlikely(ret)) return ret; if (skb->ip_summed == CHECKSUM_PARTIAL) { @@ -1097,8 +1098,8 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, /* Set txbd */ desc->tx.ol_type_vlan_len_msec = cpu_to_le32(vflags.ol_type_vlan_len_msec); - desc->tx.type_cs_vlan_tso_len = cpu_to_le32( - vflags.type_cs_vlan_tso); + desc->tx.type_cs_vlan_tso_len = + cpu_to_le32(vflags.type_cs_vlan_tso); desc->tx.paylen = cpu_to_le32(paylen); desc->tx.mss = cpu_to_le16(mss); desc->tx.vlan_tag = cpu_to_le16(vflags.inner_vtag); -- GitLab